diff --git a/systemd/system/caches-manager.service b/systemd/system/caches-manager.service
index 4387b2f..f722479 100644
--- a/systemd/system/caches-manager.service
+++ b/systemd/system/caches-manager.service
@@ -1,9 +1,12 @@
 [Unit]
 Description=Caches manager: create system caches
+DefaultDependencies=no
+After=local-fs.target
+Before=systemd-tmpfiles-setup.service
 
 [Service]
 Type=oneshot
 ExecStart=caches-manager --system
 
 [Install]
-WantedBy=basic.target
+WantedBy=sysinit.target
diff --git a/systemd/user/caches-manager.service b/systemd/user/caches-manager.service
index c785794..86862bd 100644
--- a/systemd/user/caches-manager.service
+++ b/systemd/user/caches-manager.service
@@ -1,5 +1,7 @@
 [Unit]
 Description=Caches manager: create user caches
+DefaultDependencies=no
+Before=systemd-tmpfiles-setup.service
 
 [Service]
 Type=oneshot