diff --git a/Makefile b/Makefile
index 8c4c724f516..d4bcae3eda0 100644
--- a/Makefile
+++ b/Makefile
@@ -30,82 +30,82 @@ unittest: unittest-dev-241
 
 unittest-dev-222:
 	@echo "Running unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --fluent-version=22.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=22.2 $(PYTESTRERUN)
 
 unittest-dev-231:
 	@echo "Running unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --fluent-version=23.1 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=23.1 $(PYTESTRERUN)
 
 unittest-dev-232:
 	@echo "Running unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --fluent-version=23.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=23.2 $(PYTESTRERUN)
 
 unittest-dev-241:
 	@echo "Running unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --fluent-version=24.1 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=24.1 $(PYTESTRERUN)
 
 unittest-dev-242:
 	@echo "Running unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --fluent-version=24.2 $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=24.2 $(PYTESTRERUN)
 
 unittest-all-222:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=22.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=22.2 $(PYTESTRERUN)
 
 unittest-all-222-no-codegen:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=22.2 -m "not codegen_required" $(PYTESTRERUN)
 
 unittest-all-231:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=23.1 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.1 $(PYTESTRERUN)
 
 unittest-all-231-no-codegen:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.1 -m "not codegen_required" $(PYTESTRERUN)
 
 unittest-all-232:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=23.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.2 $(PYTESTRERUN)
 
 unittest-all-232-no-codegen:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=23.2 -m "not codegen_required" $(PYTESTRERUN)
 
 unittest-all-241:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=24.1 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.1 $(PYTESTRERUN)
 
 unittest-all-241-no-codegen:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.1 -m "not codegen_required" $(PYTESTRERUN)
 
 unittest-all-242:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=24.2 $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.2 $(PYTESTRERUN)
 
 unittest-solvermode-242:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --fluent-version=24.2 --solvermode $(PYTESTEXTRA) || poetry run python -m pytest --fluent-version=24.2 --solvermode $(PYTESTRERUN)
 
 unittest-all-242-no-codegen:
 	@echo "Running all unittests"
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@poetry run python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTEXTRA) || poetry run python -m pytest --nightly --fluent-version=24.2 -m "not codegen_required" $(PYTESTRERUN)
 
 api-codegen:
@@ -122,12 +122,12 @@ build-doc-source:
 	@sudo rm -rf doc/source/api/solver/datamodel
 	@sudo rm -rf doc/source/api/solver/tui
 	@sudo rm -rf doc/source/api/solver/_autosummary/settings
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@xvfb-run make -C doc html
 
 build-all-docs:
 	@python doc/settings_rstgen.py
-	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples
+	@sudo rm -rf /home/ansys/.local/share/ansys_fluent_core/examples/*
 	@xvfb-run make -C doc html
 
 compare-flobject:
diff --git a/tests/test_data_model_cache.py b/tests/test_data_model_cache.py
index 7d259873b72..55889ca5f49 100644
--- a/tests/test_data_model_cache.py
+++ b/tests/test_data_model_cache.py
@@ -424,6 +424,7 @@ def test_cache_set_state(
     assert final_cache == cache_rules[rules]
 
 
+@pytest.mark.fluent_version(">=23.2")
 def test_cache_per_session():
     with (
         pyfluent.launch_fluent(mode="meshing") as m1,