more tweaks to handle outdated cache