Fix issue #19. Cache also when sorting files (sorting can be a slow operation).
Fix indent.