[Backport 2.19] [main] Undeploy code change: add edge case for models that are marked as not found in cache #3520#3552