Merge pull request #321 from webgriffe/issue-320

Make sure that query has the locale set before saving the cache entry

src/Client.php

@@ -402,20 +402,20 @@ public function getAllTags(): array
      */
     public function getEntries(Query $query = null): ResourceArray
     {
-        if ($this->queryPool->has($query)) {
-            return $this->queryPool->get($query);
-        }
-
         $queryData = $query ? $query->getQueryData() : [];
         if (!isset($queryData['locale'])) {
-            $queryData['locale'] = $this->defaultLocale;
+            $query->setLocale($this->defaultLocale);
+        }
+
+        if ($this->queryPool->has($query)) {
+            return $this->queryPool->get($query);
         }
 
         /** @var ResourceArray $entries */
         $entries = $this->request(
             'GET',
             '/spaces/'.$this->spaceId.'/environments/'.$this->environmentId.'/entries',
-            ['query' => $queryData]
+            ['query' => $query->getQueryData()]
         );
 
         $this->queryPool->save($query, $entries);