Made the realization that caching wasn't generating the correct keys

Helps if I actually put the values into the key instead of just the
IDs...