Merge "Fix up deprecation of wfMemcKey()/wfGlobalCacheKey()"