Changed out classloader storage for hashmap