Fix the SAMR cache so it works across completely insane