fixed caching overwriting