Confirmed last commit fixed caching bug. Cleanup and updated readme