Revert "Added caching (to development... yuck)"

This reverts commit d0325f317e17d7056203772582937a03d98b8bc1.