Remove legacy cache handling
Remove use of glob, fixes #3042
Fix typo