better classloader awareness handling