Added name caching