Merge "MessageCache: replace should actually replace, not reload"