Merge pull request #75 from jcarlosgarcia/issue-42

Issue 42 - Caching