Merge "Make MessageCache use getWithSetCallback() for big messages"