Completed caching
Merge pull request #5 from jordonsc/cache

Completed caching