SLICE-62 - fixed ClassToKeyMapper