Revert "Store favicons in /cache/favicon/ subfolder"

This reverts commit 409c5c2be58724cce5e95cb29e7567908b010fff.