Type caching fixed