By analysing X-ray pair distribution function data using a multivariate statistical approach, we isolate the cation solvation structure for monovalent (Li(+)/Na(+)/K(+)) and multivalent (Mg(2+)/Ca(2+)/Zn(2+)) electrolytes based on TFSI salts in diglyme. Parallel molecular dynamics simulations provide enhanced structural details. The data suggest that contact ion-pairs are a common feature in multivalent electrolytes.