diff --git a/.docker/cert.sh b/.docker/cert.sh
index e22cfba2995b5fd9d812232f562b7254233fe5b0..628ba8dd9cc19f85a515a75cebd03b8981337bfd 100755
--- a/.docker/cert.sh
+++ b/.docker/cert.sh
@@ -43,7 +43,10 @@ function cert() {
     # Certificate is for localhost
     KEYPW="${KEYPW}" openssl req -new -x509 -key caosdb.key.pem \
          -out caosdb.cert.pem -passin env:KEYPW \
-         -subj "/C=/ST=/L=/O=/OU=/CN=${CAOSHOSTNAME}"
+         -subj "/C=/ST=/L=/O=example/OU=example/CN=${CAOSHOSTNAME}" \
+         -days 365 \
+         -addext "subjectAltName = DNS:${CAOSHOSTNAME}" \
+         -addext "certificatePolicies = 1.2.3.4"
     KEYPW="${KEYPW}" KEYSTOREPW="$KEYSTOREPW" openssl pkcs12 -export \
          -inkey caosdb.key.pem -in caosdb.cert.pem -out all-certs.pkcs12 \
          -passin env:KEYPW -passout env:KEYPW
diff --git a/integrationtests/test_issues.py b/integrationtests/test_issues.py
index 32bf5320333955d101697a56e7e30ec1ba732dd5..86ce9307a74606bea03aa83b273de259041abf58 100644
--- a/integrationtests/test_issues.py
+++ b/integrationtests/test_issues.py
@@ -19,6 +19,7 @@
 from pytest import fixture, mark
 
 import caosdb as db
+from caosdb.cached import cache_clear
 
 from caoscrawler.crawl import Crawler
 from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
diff --git a/integrationtests/test_realworld_example.py b/integrationtests/test_realworld_example.py
index 63abf068120f7545c562b963243dcef825a381ff..82644947a3cdc85a38be3403615b51fe1f4ded50 100644
--- a/integrationtests/test_realworld_example.py
+++ b/integrationtests/test_realworld_example.py
@@ -30,6 +30,7 @@ import json
 import os
 
 import caosdb as db
+from caosdb.cached import cache_clear
 
 from caoscrawler.crawl import Crawler, crawler_main
 from caoscrawler.identifiable_adapters import CaosDBIdentifiableAdapter
diff --git a/integrationtests/test_use_case_simple_presentation.py b/integrationtests/test_use_case_simple_presentation.py
index e7ae2ea6542a2fbab4dbd05166291959f7e2c96f..cf38e951b78534806c0ea76ef58051436aa22704 100644
--- a/integrationtests/test_use_case_simple_presentation.py
+++ b/integrationtests/test_use_case_simple_presentation.py
@@ -29,6 +29,7 @@ from subprocess import run
 
 import caosdb as db
 from caosadvancedtools.loadFiles import loadpath
+from caosdb.cached import cache_clear
 from caosadvancedtools.models import parser as parser
 from caoscrawler.crawl import crawler_main
 from caosdb.utils.register_tests import clear_database, set_test_key
diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py
index 1e0f4238b8e04b4559c3e43f72f2e12367128807..7ea1cc20537060d1f94b9e9c9b233141acc0f565 100644
--- a/src/caoscrawler/crawl.py
+++ b/src/caoscrawler/crawl.py
@@ -37,6 +37,7 @@ import importlib
 import logging
 import os
 import sys
+from caosdb.exceptions import EmptyUniqueQueryError
 import uuid
 from caosdb.cached import cached_get_entity_by, cache_clear
 import warnings
@@ -732,7 +733,7 @@ class Crawler(object):
         parent_updates = db.Container()
 
         for entity in to_be_updated:
-            old_entity = cached_get_entity_by(id=entity.id)
+            old_entity = cached_get_entity_by(eid=entity.id)
 
             # Check whether the parents have been changed and add them if missing
             # in the old entity:
diff --git a/unittests/test_tool.py b/unittests/test_tool.py
index d0393953ecca8e6aa0947c691a44c281e049fd8f..ec3e0bb9e69a45416d23f3c7aba15ec759cabf77 100755
--- a/unittests/test_tool.py
+++ b/unittests/test_tool.py
@@ -588,9 +588,9 @@ def test_replace_entities_with_ids(crawler):
     assert a.get_property("C").value == [12345, 233324]
 
 
-def mock_get_entity_by(id=None, name=None):
-    if id is not None:
-        candidates = [el for el in list(full_data.values()) if el.id == id]
+def mock_get_entity_by(eid=None, name=None):
+    if eid is not None:
+        candidates = [el for el in list(full_data.values()) if el.id == eid]
         if len(candidates) > 0:
             return candidates[0]
         else: