diff --git a/packages/mediacenter/service.openelec.settings/scripts/backup-restore b/packages/mediacenter/service.openelec.settings/scripts/backup-restore
index 9562e4a48c..4e0887d330 100755
--- a/packages/mediacenter/service.openelec.settings/scripts/backup-restore
+++ b/packages/mediacenter/service.openelec.settings/scripts/backup-restore
@@ -29,7 +29,7 @@ if [ -e "$BACKUP_FILE" ] ; then
     echo OK
     echo -en "restoring.. this may take long time to complete, please wait.. "
     rm -rf /storage/.xbmc &>/dev/null
-    rm -rf $CONFIG_CACHE &>/dev/null
+    rm -rf /storage/.cache &>/dev/null
     rm -rf /storage/.config &>/dev/null
     tar xf $BACKUP_FILE -C / &>/dev/null
     rm -f $BACKUP_FILE &>/dev/null
diff --git a/packages/mediacenter/service.openelec.settings/system.d/backup-restore.service b/packages/mediacenter/service.openelec.settings/system.d/backup-restore.service
index 557d0b77d8..06853a5f67 100644
--- a/packages/mediacenter/service.openelec.settings/system.d/backup-restore.service
+++ b/packages/mediacenter/service.openelec.settings/system.d/backup-restore.service
@@ -1,8 +1,9 @@
 [Unit]
 Description=Restoring Backup
 DefaultDependencies=false
-After=storage.mount show-version.service
-Before=local-fs-pre.target swap.target
+After=show-version.service
+Before=local-fs-pre.target shutdown.target
+Conflicts=shutdown.target
 
 [Service]
 Type=oneshot
@@ -10,4 +11,5 @@ ExecStart=/usr/lib/openelec/backup-restore
 StandardOutput=tty
 
 [Install]
-WantedBy=basic.target
+WantedBy=local-fs-pre.target
+