fixed caching mess