Add caching
Merge pull request #21 from igalk/caching

Add caching