fix core caching