update for strongly typed cache keys (probably still broken)