Necessary changes to make the current NeCore work with Caching