Merge "Convert some users to WANObjectCache for consistency"