NEW: Flush on every build

Fixes #2325