Tighten cache key sanitation

See merge request !5719



Merged-by: Hannes Hörl <2185075-hoegaarden@users.noreply.gitlab.com>
Approved-by: Arran Walker <ajwalker@gitlab.com>
Co-authored-by: Hannes Hörl <hhoerl@gitlab.com>