diff --git a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/datasets_bindings.cc b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/datasets_bindings.cc
index eb8ba07c09..976ba6848d 100644
--- a/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/datasets_bindings.cc
+++ b/mindspore/ccsrc/minddata/dataset/api/python/bindings/dataset/include/datasets_bindings.cc
@@ -87,9 +87,8 @@ PYBIND_REGISTER(DatasetNode, 1, ([](const py::module *m) {
                            return num_workers ? self->SetNumWorkers(*num_workers) : self;
                          })
                     .def("set_cache_client",
-                         [](std::shared_ptr<DatasetNode> self) {
-                           std::shared_ptr<DatasetCache> dc = nullptr;
-                           return self->SetDatasetCache(dc);
+                         [](std::shared_ptr<DatasetNode> self, std::shared_ptr<CacheClient> cc) {
+                           return self->SetDatasetCache(toDatasetCache(std::move(cc)));
                          })
                     .def(
                       "Zip",
diff --git a/mindspore/dataset/engine/datasets.py b/mindspore/dataset/engine/datasets.py
index c944c8824f..971799b544 100644
--- a/mindspore/dataset/engine/datasets.py
+++ b/mindspore/dataset/engine/datasets.py
@@ -3475,7 +3475,7 @@ class GeneratorDataset(MappableDataset):
                 new_op.sampler = None
                 new_op.sample_fn = sample_fn
                 new_op.source_len = min(new_op.source_len,
-                                        new_op.num_samples) if new_op.num_samples is not None else new_op.source_len
+                                        new_op.num_samples) if new_op.num_samples != 0 else new_op.source_len
                 iter(self.source)
             except TypeError:
                 # Use generator function if input callable