diff --git a/README.md b/README.md
index 22f7b032..959848dd 100644
--- a/README.md
+++ b/README.md
@@ -1678,11 +1678,19 @@ func main() {
 	}
 
 	g.Go(func() error {
-		return server01.ListenAndServe()
+		err := server01.ListenAndServe()
+		if err != nil && err != http.ErrServerClosed {
+			log.Fatal(err)
+		}
+		return err
 	})
 
 	g.Go(func() error {
-		return server02.ListenAndServe()
+		err := server02.ListenAndServe()
+		if err != nil && err != http.ErrServerClosed {
+			log.Fatal(err)
+		}
+		return err
 	})
 
 	if err := g.Wait(); err != nil {
diff --git a/context.go b/context.go
index 86094cac..509ce081 100644
--- a/context.go
+++ b/context.go
@@ -393,8 +393,7 @@ func (c *Context) QueryArray(key string) []string {
 
 func (c *Context) getQueryCache() {
 	if c.queryCache == nil {
-		c.queryCache = make(url.Values)
-		c.queryCache, _ = url.ParseQuery(c.Request.URL.RawQuery)
+		c.queryCache = c.Request.URL.Query()
 	}
 }