Added caching
Merge pull request #67 from massmetrics/cache

Added caching