Make the lush caves a swamp biome regarding villagers

I like the new librarian mechanics. It gives a simple and straightforward path to the best enchantments in place of the more random and tedious path from before. However, one problem might be that swamps sometime are too far away to be detected by the biome finder command. What if you make it so that if a villager or zombie villager spawns in a lush cave, it would be a swamp villager instead of normal. You might also do similar things with the other cave variants or nether biomes.