Merge pull request #9386 from leoetlino/config-cache-invalidate Config: Fix cache not being invalidated when callbacks are suppressed