Implement #58
Merge branch 'cache'