diff --git a/.gitignore b/.gitignore
index 67e398b33..aa234c2fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -148,8 +148,9 @@ _temp_*/**/*
 Thumbs.db
 
 # AppVeyor
-/tools-cake/
+/tools/cake/
 /_artifacts/
 
 # Cake
-/tools/Addins/*
\ No newline at end of file
+/tools/Addins/*
+packages.config.md5sum
\ No newline at end of file
diff --git a/build-appveyor.cake b/build-appveyor.cake
index 5fd95b0c6..ff4ef9617 100644
--- a/build-appveyor.cake
+++ b/build-appveyor.cake
@@ -1,6 +1,6 @@
-#addin "Cake.Npm"
-#addin "SharpZipLib"
-#addin "Cake.Compression"
+#addin nuget:?package=Cake.Npm&version=0.12.1
+#addin nuget:?package=SharpZipLib&version=0.86.0
+#addin nuget:?package=Cake.Compression&version=0.1.4
 
 // Build variables
 var outputFolder = "./_output";
diff --git a/build-appveyor.ps1 b/build-appveyor.ps1
index fd3bea746..742cc6808 100644
--- a/build-appveyor.ps1
+++ b/build-appveyor.ps1
@@ -81,8 +81,8 @@ if(!$PSScriptRoot){
     $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent
 }
 
-$TOOLS_DIR = Join-Path $PSScriptRoot "tools-cake"
-$NUGET_EXE = Join-Path $TOOLS_DIR "nuget.exe"
+$TOOLS_DIR = Join-Path $PSScriptRoot "tools"
+$NUGET_EXE = Join-Path $TOOLS_DIR "nuget/nuget.exe"
 $CAKE_EXE = Join-Path $TOOLS_DIR "Cake/Cake.exe"
 $NUGET_URL = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
 $PACKAGES_CONFIG = Join-Path $TOOLS_DIR "packages.config"
@@ -156,7 +156,12 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
     if((!(Test-Path $PACKAGES_CONFIG_MD5)) -Or
       ($md5Hash -ne (Get-Content $PACKAGES_CONFIG_MD5 ))) {
         Write-Verbose -Message "Missing or changed package.config hash..."
-        Remove-Item * -Recurse -Exclude packages.config,nuget.exe
+        Get-ChildItem -Path $TOOLS_DIR -Recurse -Exclude packages.config |
+        Select -ExpandProperty FullName |
+        Where {$_ -notlike (Join-Path $TOOLS_DIR "pdb2mdb*")} |
+        Where {$_ -notlike (Join-Path $TOOLS_DIR "nuget*")} |
+        sort length -Descending |
+        Remove-Item -Recurse 
     }
 
     Write-Verbose -Message "Restoring tools from NuGet..."
@@ -181,4 +186,4 @@ if (!(Test-Path $CAKE_EXE)) {
 # Start Cake
 Write-Host "Running build script..."
 Invoke-Expression "& `"$CAKE_EXE`" `"$Script`" -target=`"$Target`" -configuration=`"$Configuration`" -verbosity=`"$Verbosity`" $UseMono $UseDryRun $UseExperimental $ScriptArgs"
-exit $LASTEXITCODE
\ No newline at end of file
+exit $LASTEXITCODE
diff --git a/tools/packages.config b/tools/packages.config
new file mode 100644
index 000000000..36afb6f92
--- /dev/null
+++ b/tools/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+    <package id="Cake" version="0.25.0" />
+</packages>
\ No newline at end of file