Caching features backported from 0.6
Updating of cache, with test
Merge pull request #157 from andrewmcguinness/0.4.x-cache

Caching features backported from 0.6