Merge "objectcache: make sure variant keys are namespaced as keys should be"