Merge "objectcache: fix some makeKey/makeGlobalKey IDEA warnings"