Merge "Avoid duplicate key generation code in MessageCache"