Merge "objectcache: remove inheritence from CachedBagOStuff"