Merge pull request #124 from Masterminds/feature/cache

Feature/cache