Fixed caching callbacks
Merge pull request #2 from ramatevish/adding_caching

Fixed caching callbacks