Merge "objectcache: reorganize WANObjectCache fields and avoid exposing internal...