Merge "Inject remaining cache objects into MessageCache"