Our work aims to substantiate and extend earlier findings on the effects of student-teacher race matching on academic achievement using longitudinal data for students in Grades 3 through 8 in Tennessee. We examine heterogenous effects not only by racial subgroup and student preparedness, as explored in prior literature, but also by levels of teacher effectiveness, drawing on data from the state's teacher evaluation system. We find that student-teacher race congruence does not have a significant overall effect on test scores. However, subgroup analyses reveal a positive, significant race-match effect in elementary school math. We observe meaningful effects for Black students in both reading and math, race-matched students in the bottom-most preparedness quartile in math, and race-matched students assigned to teachers in the middle two teacher performance quartiles in math. Our results align with prior findings, emphasizing that race-match effects transcend state borders. Findings support policy efforts to diversify the educator labor force.