caching fixed?