now correctly saving raw data when using gen-cache