Make cache key ids conform to target ids.

Makes debugging easier.