Optimize files cache
Name fixes