Merge branch 'cache_crash' into 'next'

Fix Crash of Cache Clearing

See merge request !1395
1 job for master in 4 minutes and 31 seconds
Status Job ID Name Coverage
  Test
passed #821607
flatpak
flatpak

00:04:31