yes, in public schools, and penalize behavior to an appropriate degree
Private schools should be incentivized financially to do this. It should be obvious which institutions do not want diversity taught as a norm—but it is an American value and should be taught in schools.