diff --git a/vcr/config.py b/vcr/config.py
index 4cc335f..657f706 100644
--- a/vcr/config.py
+++ b/vcr/config.py
@@ -9,7 +9,7 @@ class VCR(object):
                  serializer='yaml',
                  cassette_library_dir=None,
                  record_mode="once",
-                 match_on=['url', 'method'],
+                 match_on=['method', 'host', 'port', 'path', 'query'],
                  filter_headers=[],
                  filter_query_parameters=[],
                  before_record=None,
@@ -25,7 +25,9 @@ class VCR(object):
             'method': method,
             'url': url,
             'host': host,
+            'port': method,
             'path': path,
+            'query': path,
             'headers': headers,
             'body': body,
         }