Revert "MessageCache invalidation improvements" (temporary)