refactor use of cache
use_cache cleanup
Merge pull request #42 from jacobb/cache2.0

refactor use of cache