Rework cache files
Don't strip out dashes
Make sure player is added to cache