Force regeneration every time for consistency + improved logs