Merge "Stop overwriting $cache in User::getCacheKey()"