BAP-6989: 500 error after removing cache
 - fix
Merge pull request #3414 from laboro/fix/BAP-6989_invalid_cache

BAP-6989: 500 error after removing cache
Merge remote-tracking branch 'remotes/dev/1.5' into 1.5