Fix cache tagging feature.