4 files changed, 24 insertions, 4 deletions
diff --git a/plugin/cache/cache.go b/plugin/cache/cache.go
index 972c2b5e1..4e64fa733 100644
--- a/plugin/cache/cache.go
+++ b/plugin/cache/cache.go
@@ -130,7 +130,6 @@ func (w *ResponseWriter) WriteMsg(res *dns.Msg) error {
 	}
 
 	if key != -1 && duration > 0 {
-
 		if w.state.Match(res) {
 			w.set(res, key, mt, duration)
 			cacheSize.WithLabelValues(w.server, Success).Set(float64(w.pcache.Len()))
diff --git a/plugin/cache/spoof_test.go b/plugin/cache/spoof_test.go
index e9c618f03..71930f4dc 100644
--- a/plugin/cache/spoof_test.go
+++ b/plugin/cache/spoof_test.go
@@ -14,7 +14,7 @@ import (
 func TestSpoof(t *testing.T) {
 	// Send query for example.org, get reply for example.net; should not be cached.
 	c := New()
-	c.Next = spoofHandler()
+	c.Next = spoofHandler(true)
 
 	req := new(dns.Msg)
 	req.SetQuestion("example.org.", dns.TypeA)
@@ -39,13 +39,29 @@ func TestSpoof(t *testing.T) {
 	}
 }
 
+func TestResponse(t *testing.T) {
+	// Send query for example.org, get reply for example.net; should not be cached.
+	c := New()
+	c.Next = spoofHandler(false)
+
+	req := new(dns.Msg)
+	req.SetQuestion("example.net.", dns.TypeA)
+	rec := dnstest.NewRecorder(&test.ResponseWriter{})
+
+	c.ServeDNS(context.TODO(), rec, req)
+
+	if c.pcache.Len() != 0 {
+		t.Errorf("cached %s, while reply had response set to %t", "example.net.", rec.Msg.Response)
+	}
+}
+
 // spoofHandler is a fake plugin implementation which returns a single A records for example.org. The qname in the
 // question section is set to example.NET (i.e. they *don't* match).
-func spoofHandler() plugin.Handler {
+func spoofHandler(response bool) plugin.Handler {
 	return plugin.HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
 		m := new(dns.Msg)
 		m.SetQuestion("example.net.", dns.TypeA)
-		m.Response = true
+		m.Response = response
 		m.Answer = []dns.RR{test.A("example.org. IN A 127.0.0.53")}
 		w.WriteMsg(m)
 		return dns.RcodeSuccess, nil
diff --git a/request/request.go b/request/request.go
index c45f6e571..64504e6b4 100644
--- a/request/request.go
+++ b/request/request.go
@@ -380,6 +380,10 @@ func (r *Request) Match(reply *dns.Msg) bool {
 		return false
 	}
 
+	if reply.Response == false {
+		return false
+	}
+
 	if strings.ToLower(reply.Question[0].Name) != r.Name() {
 		return false
 	}
diff --git a/request/request_test.go b/request/request_test.go
index 41630d669..97f17a605 100644
--- a/request/request_test.go
+++ b/request/request_test.go
@@ -162,6 +162,7 @@ func TestRequestScrubAnswerExact(t *testing.T) {
 func TestRequestMatch(t *testing.T) {
 	st := testRequest()
 	reply := new(dns.Msg)
+	reply.Response = true
 
 	reply.SetQuestion("example.com.", dns.TypeMX)
 	if b := st.Match(reply); b {