Updated caching
Merge pull request #30 from juettemann/master

Updated caching