fix double caching