No longer make subdirectories in cache
No longer split on hyphen in card types