Volcanoes integrated with the new cave and mountain systems

Multiple variations of volcano:

1. Active

Has a lava lake in a crater at the top of the volcano.

2. Dormant

Has no lava in its crater but can generate with a water lake. Has a semi-hollow tube connecting it to an underground lava lake/magma chamber.

3. Extinct 

Has no lava lake and has a filled andesite, diorite or granite tube connecting it to a big cave or aquifer.
Almost always has a crater water lake.

These volcanoes can range in size and shape from tall and skinny cones to short but very wide caldera's.
If they spawn in an ocean biome it will create a volcanic island.

Extra idea: Generation of these could connect with the generation of Basalt Deltas in the Nether.