Different Andesite, Diorite and Granite generation

The new cave generation has great shapes, however the splashes of granite and diorite make the caves look messy.  I'd like to suggest that the generation of these stone variants become cave-biome specific.  Instead of having random patches of granite, diorite and andesite everywhere underground, there could be certain cave-biomes that have a higher concentration of one or two kinds, while most normal caves either have a reduced generation of these stone variants, or just none at all. 

This will help the caves to look cleaner, while giving the cave-biomes that generate the specific stone variants a unique look.  Having specific cave biomes that generate granite, andesite or diorite will also give players a reason to seek out these biomes, learn the names of them, and also provide landmarks for underground exploration beyond the shape of the biomes.