Fix ~50 invalidations stemming from modules_to_be_loaded
#41878
Merged
modules_to_be_loaded
#41878