Quick refactor of the caching stuff
Added a raw modifier on criteria