Merge "Avoid cache stampedes in ChangeTag class"