Merge "Reduce code duplication in MessageCache"