Reworking data generation to deal with caching bugs