More consistency for tag-related cache keys