Added caching
Merge pull request #2 from astina/v1.0

Added caching