diff --git a/src/flask_covid19/blueprints/app_all/all_model.py b/src/flask_covid19/blueprints/app_all/all_model.py
index d8a816063b0df01a9c2cd20bb0c82fcedb7748ac..859c2fe68f02e94b2ff2ba94380ec8dc3a377c92 100644
--- a/src/flask_covid19/blueprints/app_all/all_model.py
+++ b/src/flask_covid19/blueprints/app_all/all_model.py
@@ -144,7 +144,6 @@ class BlueprintDateReported(BlueprintEntity):
         return db.session.query(cls).filter(cls.datum == datum).one()
 
     @classmethod
-    @cache.memoize(50)
     def get_by_date_reported(cls, date_reported_import_str: str):
         return db.session.query(cls)\
             .filter(cls.date_reported_import_str == date_reported_import_str)\
@@ -222,7 +221,7 @@ class BlueprintLocationGroup(BlueprintEntity):
             .one()
 
     @classmethod
-    @cache.memoize(50)
+    # @cache.memoize(50)
     def find_by_location_group(cls, location_group: str):
         return db.session.query(cls) \
             .filter(cls.location_group == location_group) \
@@ -481,7 +480,6 @@ class AllImport(BlueprintEntity):
     datum = db.Column(db.Date, nullable=False)
 
     @classmethod
-    @cache.memoize(50)
     def find_by_datum(cls, datum: date):
         return db.session.query(cls) \
             .filter(cls.datum == datum) \
diff --git a/src/flask_covid19/blueprints/data_rki/rki_model.py b/src/flask_covid19/blueprints/data_rki/rki_model.py
index 3cd239d1f8b7f33436fa362627d86c7df64b8b79..39b14e0c9acc4d82d20cc5d1104af136a0151102 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_model.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_model.py
@@ -149,8 +149,7 @@ class RkiLandkreis(BlueprintLocation):
     )
 
     def __repr__(self):
-        return "%s(%s %s %s)" % (self.__class__.__name__,
-                                 self.location_group.__repr__(), self.location, self.id_landkreis)
+        return "%s(%s %s)" % (self.__class__.__name__, self.location, self.id_landkreis)
 
     def __str__(self):
         return " " + str(self.location_group) + " : " + self.location + " ( " + self.id_landkreis + " ) "
diff --git a/src/flask_covid19/blueprints/data_rki/rki_service_import.py b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
index 283ed52fb3cfeb73243c3386d52fa07e8f626107..3756c3acdf3385235f18107890435d2bb6d09451 100644
--- a/src/flask_covid19/blueprints/data_rki/rki_service_import.py
+++ b/src/flask_covid19/blueprints/data_rki/rki_service_import.py
@@ -101,6 +101,7 @@ class RkiServiceImport:
                     if (k % 2000) == 0:
                         db.session.commit()
                         app.logger.info(" import RKI ... " + str(k) + " rows")
+                        break
                     if k == 230091:
                         break
                 db.session.commit()
diff --git a/src/flask_covid19/blueprints/data_who/who_model.py b/src/flask_covid19/blueprints/data_who/who_model.py
index 796482e17f1c05fb72f3aaf9780189cad8814934..8c8beac735ffc13ace7255181a8ce3d552971e68 100644
--- a/src/flask_covid19/blueprints/data_who/who_model.py
+++ b/src/flask_covid19/blueprints/data_who/who_model.py
@@ -109,7 +109,6 @@ class WhoCountry(BlueprintLocation):
         ).one()
 
     @classmethod
-    @cache.memoize(50)
     def find_by_location_code_and_location(cls, location_code: str, location: str):
         return db.session.query(cls).filter(
             and_(
@@ -151,7 +150,7 @@ class WhoData(BlueprintFactTable):
     )
 
     def __repr__(self):
-        return "%s(%s %s)" % (self.__class__.__name__, self.date_reported.__repr__(), self.location.__repr__())
+        return "%s(%s %s)" % (self.__class__.__name__, self.date_reported_id, self.location_id)
 
     id = db.Column(db.Integer, primary_key=True)
     date_reported_id = db.Column(db.Integer, db.ForeignKey('who_date_reported.id'), nullable=False)
diff --git a/src/flask_covid19/blueprints/data_who/who_model_import.py b/src/flask_covid19/blueprints/data_who/who_model_import.py
index c143c93e5ce1e1dacaa2812f4a7cc2ffaedec1d9..a199ba8805ca900e314094245ad234a6aab11dba 100644
--- a/src/flask_covid19/blueprints/data_who/who_model_import.py
+++ b/src/flask_covid19/blueprints/data_who/who_model_import.py
@@ -52,7 +52,6 @@ class WhoImport(AllImport):
             .all()
 
     @classmethod
-    @cache.cached(timeout=50)
     def get_dates_reported_as_string_array(cls):
         myresultarray = []
         myresultset = db.session.query(cls.datum)\
diff --git a/src/flask_covid19/blueprints/data_who/who_service_import.py b/src/flask_covid19/blueprints/data_who/who_service_import.py
index 5406f5e9fcb42efef61acff11a79188c7efc9b9d..787031a481c23f78a4168e12e33010ab25d10c46 100644
--- a/src/flask_covid19/blueprints/data_who/who_service_import.py
+++ b/src/flask_covid19/blueprints/data_who/who_service_import.py
@@ -95,7 +95,7 @@ class WhoServiceImport:
             for item_key, item_value in row.items():
                 app.logger.warning(item_key+" : "+item_value)
             app.logger.warning("WARN: import WHO [end]")
-        except (Exception, psycopg2.DatabaseError) as error:
+        except Exception as error:
             app.logger.warning("WARN: import WHO [begin]")
             app.logger.warning(error)
             app.logger.warning("WARN: import WHO [end]")