moving the code into p_xhtml_cached_geshi, mean replacing the calls to code with direct calls to p_xhtml_cached_geshi, that way each caller can choose their own html wrapper element
what is your take on adding an extra parameter to 'html' and 'php' function in the xhtml renderer. The extra parameter would have a default value to maintain current behaviour, but would allow the block modes (phpblock and htmlblock) to call their corresponding inline version with a different value and avoid duplicating the (small amount of) code in the inline versions?