Merge pull request #24 from craigspaeth/cache

Caching cleanup + tests
Remove version lock