Merge pull request #73 from everydayhero/jr-add-caching