Classloading performance improvements for #1082

Signed-off-by: Ross Allan <rallanpcl@gmail.com>