Fix up cache clearing (#18752)

Commit

253 days ago

Fix up cache clearing (#18752) Fixup of #18751 Uses IDs rather than keys to more consistently delete caches