Fix to caching engine