Added moar cache stuff
All tests pass again
Files fixed