Eeep. Forgot to initialise the Cache.
Merging develop branch with master branch.