Given this format, I expect the Caves to be completely re-worked and reduced in scope quite a bit. I'd be surprised if it was the "Evil Humanoid Hotel (with Bonus Evil Temple)" of the original.
Assuming that's the case, a retrofitted Caves might include:
1. The Evil Temple with undead and a BBEG.
2. Two, maybe three of the humanoid groups. Something like the goblins (with the hired Ogre) overseen by Hobgoblins and Bugbears, all who are aligned with the temple.
3. The Owlbear. But now the owlbear has a broken spear stuck in it and a young owlbear you can adopt...