diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 36695266685b1667d231eda279ee8124e1a7bcd7..07df8d9c6ee10dd48a1aa352427e353d1db2674e 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -46,7 +46,7 @@ from kamaki.cli.config import Config
 from kamaki.clients import ClientError
 from kamaki.clients.image import ImageClient
 from kamaki.clients.pithos import PithosClient
-from kamaki.clients.astakos import AstakosClient
+from kamaki.clients.astakos import CachedAstakosClient as AstakosClient
 
 try:
     config = Config()
diff --git a/version b/version
index 5a2a5806df6e909afe3609b5706cb1012913ca0e..ee6cdce3c29053ac99607147be5be250efa001bd 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6
+0.6.1