Merge "ObjectCacheSessionHandler::getCache() returns BagOStuff"