Removed obsolete entityinfocache reference and included entityvaluecollection for change tracking.