fixed caching of data