Made the cache system configurable to the end user
Merge pull request #222 from lyncodev/configurable-cache

Made the cache system configurable to the end user
Merge branch 'master' into feature/220