Merge "Fix UserTest case that was missing a cache purge"