FORGE-1824: More updates to address classpath isolation