now cache is properly working
Merge pull request #14 from sevoan/WIP