Merge "MessageCache: Use checkKeys for large messages"