The OP is already diving bp/w, doubles, a drysuit and can light. Taking cavern in some other gear doesn't make sense.Also at the Cavern level you do not "have" to be in full on cave gear. Recreational gear with some minor tweaks is more than fine for Cavern.