Issue #2573221 by Jelle_S: Keyed mapping static cache is not rebuilt when overwriting an existing mapping