Merge "Fix the race condition that cause windows cache stale"