fixing name caching