Merge "objectcache: Remove getWithSetCallback() signature backwards-compatability"