Remove unused code
Replace per-mode handler properties with generic cache