Merge "objectcache: remove references to recently removed methods"