Merge pull request #836 from narfbg/develop-cache

Improve the Cache library