Merge "Make HTMLCacheUpdate callers more consistent"