Merge "MessageCache: Avoid 'contributions' replicas"