Merge "Revert "MessageCache invalidation improvements" (temporary)"