CR-IC-6875 - get rid of TypeSafeDataProvider