Fix cached filenames
Fix the filename of cached files, so that it contains the `builder.dataset_name` instead of `builder.name`.

Fix partially #1589.
Fix cached filenames: Fix the filename of cached files, so that it contains the `builder.dataset_name` instead of `builder.name`.

Fix partially #1589.