File store increment/decrement
Don't use extract
Merge branch '4.2-cache' of https://github.com/GrahamCampbell/framework into GrahamCampbell-4.2-cache
Cleaning up code.