Issue #1080964 by catch: Be more sparing with locale cache clears