Fixed more InsertTag caching issues