Option to disable Cauldrons and Barrels as Villager Workstations

Cauldrons serve many functions for the Player, incuding the collection of lava, snow, making dyes and magic arrows. I'd love to have a lava farm within a 48-block radius of my village without every new villager turning into a useless Leather Worker. Please add an "of/off" switch for making this the Player's work station rather than one for rent to villagers? Maybe a Flag Toggle? Or if filled with any substance, it becomes the player's property alone?

Same for Barrels, which I'd like to use for decorate storage around my village without being overrun with fisherman, with whom I do not care to trade, or enjoy the smell of. Maybe make a Fish Barrel vs a normal barrel to distinguish the two types?