Merge "Cleanups to WANObjectCache::getWithSetCallback code"