fixed caching issues