better cache filename guessing, again