Added .dat caching