Axisymmetric Waves in Re-Entrant Cavities