diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index d7a9239e5..670b71a6d 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -3499,28 +3499,23 @@ class Model extends Object implements CakeEventListener {
  * @return boolean true on delete
  */
 	protected function _clearCache($type = null) {
-		if ($type === null) {
-			if (Configure::read('Cache.check') === true) {
-				$pluralized = Inflector::pluralize($this->alias);
-				$assoc[$this->alias] = strtolower($pluralized);
-				$assoc[] = strtolower(Inflector::underscore($pluralized));
-				foreach ($this->_associations as $association) {
-					foreach ($this->$association as $associatedClass) {
-						$className = $associatedClass['className'];
-						if (!isset($assoc[$className])) {
-							$pluralized = Inflector::pluralize($className);
-							$assoc[$className] = strtolower($pluralized);
-							$assoc[] = strtolower(Inflector::underscore($pluralized));
-						}
-					}
-				}
-				$assoc = array_unique($assoc);
-				clearCache($assoc);
-				return true;
-			}
-		} else {
-			//Will use for query cache deleting
+		if ($type !== null || Configure::read('Cache.check') !== true) {
+			return;
 		}
+		$assoc[] = strtolower(Inflector::pluralize($this->alias));
+		$assoc[] = Inflector::underscore(Inflector::pluralize($this->alias));
+		foreach ($this->_associations as $association) {
+			foreach ($this->$association as $className) {
+				$pluralized = strtolower(Inflector::pluralize($className['className']));
+				if (!in_array($pluralized, $assoc)) {
+					$assoc[] = $pluralized;
+					$assoc[] = Inflector::underscore(Inflector::pluralize($className['className']));
+				}
+			}
+		}
+		$assoc = array_unique($assoc);
+		clearCache($assoc);
+		return true;
 	}
 
 /**