diff --git a/PropertySuggester.php b/PropertySuggester.php
index 13afd6a..0fd6277 100644
--- a/PropertySuggester.php
+++ b/PropertySuggester.php
@@ -9,7 +9,7 @@
 	return;
 }
 
-define( 'PropertySuggester_VERSION', '3.1.1' );
+define( 'PropertySuggester_VERSION', '3.1.2' );
 
 if ( file_exists( __DIR__ . '/vendor/autoload.php' ) ) {
 	require_once __DIR__ . '/vendor/autoload.php';
diff --git a/README.md b/README.md
index bf1449f..40138b3 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,9 @@ generate this data from a wikidata dump.
 
 ## Release notes
 
+### 3.1.2 (2016-08-04)
+* Follow up fix for entity suggester, update cache management in EntitySuggester.
+
 ### 3.1.1 (2016-08-03)
 * Follow up fix for entity suggester, update method call in EntitySuggester.
 
diff --git a/modules/ext.PropertySuggester.EntitySelector.js b/modules/ext.PropertySuggester.EntitySelector.js
index a36834b..7511184 100644
--- a/modules/ext.PropertySuggester.EntitySelector.js
+++ b/modules/ext.PropertySuggester.EntitySelector.js
@@ -52,9 +52,10 @@
 					search: term,
 					context: this._getPropertyContext(),
 					format: 'json',
-					language: self.options.language,
-					'continue': self._cache[term] && self._cache[term].nextSuggestionOffset
-						? self._cache[term].nextSuggestionOffset : 0
+					language: this.options.language,
+					'continue': this._cache.term === term && this._cache.nextSuggestionOffset
+						? this._cache.nextSuggestionOffset
+						: 0
 				};
 				if( data.context == 'item' ) {
 					data.entity = self._getEntity().getId();