Updated to use latest caching lib (2.1.0.0)