Revert caching. Broken on notebook