Which Event can I use to spawn in Villages?

Hello, my mod has an option to spawn entities in a Village when it is first created.

In 1.12.2, I was handling the PopulateChunkEvent.Post event, checking if the chunk had generated in a village, and spawning entities accordingly. Now in 1.13.2, I haven't been able to find an Event that fires at the right time. I know there are ways to add custom Structures / Features to villages, but I haven't worked out how to spawn an Entity in the Village. Any suggestions on how to work this in?

Possible ideas:

- Hook into the Villager tick event and spawn the entity under similar conditions to Iron Golems (Pros: it would work. Cons: expensive and unreliable if I only want to generate the entity upon Village creation)

If you want to see what I was doing previously, the code is here.

Thank you for any advice!