removed overlap test in unpacking of classes, should remove error with entity cache usage