Merge "objectcache: remove messy inheritence from APCBagOStuff in APCUBagOStuff"