Issue #2348421: Fixing test failures due to cache_decisions now being set by default