More tweaks to resolver cache logic