Fixed usage of class name as key in identity map