Improved cache
Merge pull request #60 from korczis/devel

Improved cache