Merge "CachingSiteStore: Avoid deprecated wfMemcKey()"