Sort files
Fixed the caching to actually work
Merge remote-tracking branch 'origin/master'