added caching stuff
Merge branch 'master' of https://github.com/MinionsHugb/pa2-part2