Fixed cache doc blocks
Fixed cache docblocks
File store increment/decrement
Don't use extract
Cleaning up code.
Merge.