django-cms
diff --git a/‎cms/api.py
Lines changed: 6 additions & 2 deletions b/‎cms/api.py
Lines changed: 6 additions & 2 deletions
diff --git a/‎cms/forms/validators.py
Lines changed: 8 additions & 3 deletions b/‎cms/forms/validators.py
Lines changed: 8 additions & 3 deletions
diff --git a/‎cms/models/pagemodel.py
Lines changed: 1 addition & 1 deletion b/‎cms/models/pagemodel.py
Lines changed: 1 addition & 1 deletion
@@ -22,6 +22,7 @@
 
               def my_function():
                   from cms.api import api_function
+
                   api_function(...)
 
           instead of:
@@ -30,10 +31,12 @@ def my_function():
 
               from cms.api import api_function
 
+
               def my_function():
                   api_function(...)
 
 """
+
 import warnings
 
 from django.contrib.auth import get_user_model
@@ -47,8 +50,7 @@ def my_function():
 from cms.app_base import CMSApp
 from cms.apphook_pool import apphook_pool
 from cms.constants import TEMPLATE_INHERITANCE_MAGIC
-from cms.forms.validators import validate_url_uniqueness
-from cms.models import PageContent, PageUrl
+from cms.models import PageContent
 from cms.models.pagemodel import Page
 from cms.models.permissionmodels import (
     ACCESS_PAGE_AND_DESCENDANTS,
@@ -347,6 +349,8 @@ def create_page_content(
         created_by = get_clean_username(created_by)
 
     try:
+        from cms.forms.validators import validate_url_uniqueness
+
         validate_url_uniqueness(page.site, path, language, exclude_page=page.parent)
     except ValidationError as e:
         raise IntegrityError(e)
 
@@ -1,13 +1,16 @@
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
 
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator, URLValidator
 from django.utils.safestring import mark_safe
 from django.utils.translation import gettext
 
-from cms.models.pagemodel import Page
 from cms.utils.urlutils import admin_reverse, relative_url_regex
 
+if TYPE_CHECKING:
+    # Only needed for type hinting - avoid circular import
+    from cms.models.pagemodel import Page
+
 
 def validate_relative_url(value):
     RegexValidator(regex=relative_url_regex)(value)
@@ -22,7 +25,9 @@ def validate_url(value):
         URLValidator()(value)
 
 
-def validate_url_uniqueness(site, path: str, language: str, user_language: Optional[str] = None, exclude_page: Optional[Page] = None):
+def validate_url_uniqueness(
+    site, path: str, language: str, user_language: Optional[str] = None, exclude_page: Optional["Page"] = None
+):
     """Checks for conflicting urls"""
     from cms.models.pagemodel import Page, PageUrl
 
 
@@ -838,7 +838,7 @@ def get_url_obj(self, language, fallback=True):
         if fallback:
             languages.extend(self.get_fallbacks(language))
 
-        if language not in self.urls_cache:
+        if self.urls_cache is None or language not in self.urls_cache:
             # `get_page_from_request` will fill the cache only for the current language
             # Here, we fully fill it and try again
             self.urls_cache = {url.language: url for url in self.urls.all() if url.language in languages}