Merge branch 'feature/cache' into develop
Merge pull request #2 from jackrex/develop

Merge branch 'feature/cache' into develop