Backport "Fix stale top level synthetic package object being used in later runs" to 3.7.2

Backport "Fix stale top level synthetic package object being used in later runs" to 3.7.2 #26714