Merge "Use stock BagOStuff lock methods in MessageCache"