Reorganized CSV and Cache