Automatic rebuild cache on exception, fixes #5213 (#8257) - Backport to 1.4-maint

Automatic rebuild cache on exception, fixes #5213 (#8257) - Backport to 1.4-maint #1416