fixing caching issues