4 files changed, 57 insertions, 6 deletions
diff --git a/core/directives.go b/core/directives.go
index fbbba40c7..2529dacb1 100644
--- a/core/directives.go
+++ b/core/directives.go
@@ -57,6 +57,7 @@ var directiveOrder = []directive{
 	{"chaos", setup.Chaos},
 	{"rewrite", setup.Rewrite},
 	{"loadbalance", setup.Loadbalance},
+	{"cache", setup.Cache},
 	{"file", setup.File},
 	{"secondary", setup.Secondary},
 	{"etcd", setup.Etcd},
diff --git a/core/setup/cache.go b/core/setup/cache.go
new file mode 100644
index 000000000..0d2440cfc
--- /dev/null
+++ b/core/setup/cache.go
@@ -0,0 +1,54 @@
+package setup
+
+import (
+	"strconv"
+
+	"github.com/miekg/coredns/middleware"
+	"github.com/miekg/coredns/middleware/cache"
+)
+
+// Cache sets up the root file path of the server.
+func Cache(c *Controller) (middleware.Middleware, error) {
+	ttl, zones, err := cacheParse(c)
+	if err != nil {
+		return nil, err
+	}
+	return func(next middleware.Handler) middleware.Handler {
+		return cache.NewCache(ttl, zones, next)
+	}, nil
+}
+
+func cacheParse(c *Controller) (int, []string, error) {
+	var (
+		err error
+		ttl int
+	)
+
+	for c.Next() {
+		if c.Val() == "cache" {
+			// cache [ttl] [zones..]
+
+			origins := []string{c.ServerBlockHosts[c.ServerBlockHostIndex]}
+			args := c.RemainingArgs()
+			if len(args) > 0 {
+				origins = args
+				// first args may be just a number, then it is the ttl, if not it is a zone
+				t := origins[0]
+				ttl, err = strconv.Atoi(t)
+				if err == nil {
+					origins = origins[1:]
+					if len(origins) == 0 {
+						// There was *only* the ttl, revert back to server block
+						origins = []string{c.ServerBlockHosts[c.ServerBlockHostIndex]}
+					}
+				}
+			}
+
+			for i, _ := range origins {
+				origins[i] = middleware.Host(origins[i]).Normalize()
+			}
+			return ttl, origins, nil
+		}
+	}
+	return 0, nil, nil
+}
diff --git a/core/setup/file.go b/core/setup/file.go
index 25ee5149d..0b33fe47f 100644
--- a/core/setup/file.go
+++ b/core/setup/file.go
@@ -40,7 +40,7 @@ func fileParse(c *Controller) (file.Zones, error) {
 	names := []string{}
 	for c.Next() {
 		if c.Val() == "file" {
-			// file db.file [origin]
+			// file db.file [zones...]
 			if !c.NextArg() {
 				return file.Zones{}, c.ArgErr()
 			}
@@ -83,7 +83,6 @@ func fileParse(c *Controller) (file.Zones, error) {
 					}
 					z[origin].NoReload = noReload
 				}
-
 			}
 		}
 	}
diff --git a/core/setup/loadbalance.go b/core/setup/loadbalance.go
index 93b919e5f..4b132489b 100644
--- a/core/setup/loadbalance.go
+++ b/core/setup/loadbalance.go
@@ -5,15 +5,12 @@ import (
 	"github.com/miekg/coredns/middleware/loadbalance"
 )
 
-// Root sets up the root file path of the server.
+// Loadbalance sets up the root file path of the server.
 func Loadbalance(c *Controller) (middleware.Middleware, error) {
 	for c.Next() {
-		// and choosing the correct balancer
 		// TODO(miek): block and option parsing
 	}
 	return func(next middleware.Handler) middleware.Handler {
 		return loadbalance.RoundRobin{Next: next}
 	}, nil
-
-	return nil, nil
 }