Merge "objectcache: various cleanups to WANObjectCache"