Merge "Fix old regression in HTMLCacheUpdate de-duplication"