Implements BUKKIT-5506

Add methods for better lifetime control.