Merge "MessageCache invalidation improvements"