Updated to use thread class loader for adapters as well