Merge "objectcache: minor refactoring to BagOStuff"