Merge "Fix incorrect cache key."