Merge "Add small HtmlCacheUpdater service class to normalize purging code"