Merge pull request #15 from sebasguts/master

Caching update