Issue #2328539: Fixes segments not being updated for targeting after they've been cached