Revert caching. Broken on notebook
Merge pull request #32 from ChrisBeaumont/revert-cache

Revert cache code for notebook