Merge "objectcache: Avoid using deprecated ScopedCallback alias"