ValidateFunc deprecation in terraform-plugin-sdk v2

Hello, we are creating a new terraform provider. After updating SDK to v2.0.0-rc2 we got a deprecation warning in ValidateFunc (ValidateDiagFunc should be used), but methods in validation package (github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation) return schema.SchemaValidateFunc. Did we miss something?

An example

"media": {
  Type: schema.TypeString,
  Required: true,
  ValidateFunc: validation.StringInSlice([]string{"cdrom", "disk"}, false),
}

Thanks for pointing us into the right direction :).