Merge "Fix the cache timestamp for forced updates."