Completed controller changes for csv caching