diff --git a/Gemfile b/Gemfile
index e33d5a4..eef99e8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,9 +3,9 @@ source 'https://rubygems.org'
 gemspec
 
 group :development do
-  # TODO: Lock to 1.2.3 once it is out with this fix: https://github.com/mitchellh/vagrant/pull/1685
-  gem 'vagrant', git: 'https://github.com/mitchellh/vagrant.git'
-  gem 'vagrant-cachier'
+  gem 'vagrant',          github: 'mitchellh/vagrant'
+  gem 'vagrant-cachier',  github: 'fgrehm/vagrant-cachier'
+  gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine'
   gem 'guard'
   gem 'guard-rspec'
   gem 'rb-inotify'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3c3c263..ed1f6d5 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,12 +1,23 @@
 GIT
-  remote: https://github.com/mitchellh/vagrant.git
-  revision: ccfd321ef98dc5c12b180cc3a26f12d870c0eff5
+  remote: git://github.com/fgrehm/vagrant-cachier.git
+  revision: ae6cb5bcfbdbb2157867d77ded8f2b6f430c0f6c
   specs:
-    vagrant (1.2.3.dev)
+    vagrant-cachier (0.2.0)
+
+GIT
+  remote: git://github.com/fgrehm/vagrant-pristine.git
+  revision: 45a8d75f048bd611e337583496eb2b48b6998bbd
+  specs:
+    vagrant-pristine (0.1.0)
+
+GIT
+  remote: git://github.com/mitchellh/vagrant.git
+  revision: 6d26c86c4c3f65e2e59f4dda6bca9cd9235de704
+  specs:
+    vagrant (1.2.4.dev)
       childprocess (~> 0.3.7)
       erubis (~> 2.7.0)
       i18n (~> 0.6.0)
-      json (>= 1.5.1, < 1.8.0)
       log4r (~> 1.1.9)
       net-scp (~> 1.1.0)
       net-ssh (~> 2.6.6)
@@ -31,36 +42,35 @@ GEM
       thor
     diff-lcs (1.2.4)
     erubis (2.7.0)
-    ffi (1.8.1)
+    ffi (1.9.0)
     formatador (0.2.4)
-    guard (1.8.0)
+    guard (1.8.1)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (3.0.0)
+    guard-rspec (3.0.2)
       guard (>= 1.8)
       rspec (~> 2.13)
     i18n (0.6.4)
-    json (1.7.7)
-    listen (1.1.2)
+    listen (1.2.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
     log4r (1.1.10)
-    lumberjack (1.0.3)
+    lumberjack (1.0.4)
     method_source (0.8.1)
     mime-types (1.23)
-    multi_json (1.7.3)
-    net-scp (1.1.1)
+    multi_json (1.7.7)
+    net-scp (1.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.6.8)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.0.4)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
@@ -68,16 +78,16 @@ GEM
       ffi (>= 0.5.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.2)
+    rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-fire (1.1.3)
+    rspec-fire (1.2.0)
       rspec (~> 2.11)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.1)
     rspec-spies (2.1.4)
       rspec (~> 2.0)
     simplecov (0.7.1)
@@ -86,7 +96,6 @@ GEM
     simplecov-html (0.7.1)
     slop (3.4.5)
     thor (0.18.1)
-    vagrant-cachier (0.0.6)
 
 PLATFORMS
   ruby
@@ -101,5 +110,6 @@ DEPENDENCIES
   rspec-fire
   rspec-spies
   vagrant!
-  vagrant-cachier
+  vagrant-cachier!
   vagrant-lxc!
+  vagrant-pristine!