fixing caching