Merge "objectcache: Fix test coverage"