Merge "Fix typos in MessageCache"