Avoiding cache filename collision.

Better names for cache files.  This avoids collision when using repeated file names in different directories.