Merge "Make cache object mandatory for MessageCache"