Upgrade classloader-leak-prevention