Add tests
Add switch to disable caching (useful for dev)
Document caching