Merge "objectcache: Use variadic signature for makeKey()"