Fix pre-caching