FORGE-1824: Even more updates to address classpath isolation