fix merging of classcache_class_entry:s