Merge branch 'w02_MDL-43511_m26_bankcache' of https://github.com/skodak/moodle into MOODLE_26_STABLE

question/engine/bank.php

@@ -439,9 +439,6 @@ class question_finder implements cache_data_source {
     /** @var question_finder the singleton instance of this class. */
     protected static $questionfinder = null;
 
-    /** @var cache the question definition cache. */
-    protected $cache = null;
-
     /**
      * @return question_finder a question finder.
      */
@@ -461,10 +458,8 @@ class question_finder implements cache_data_source {
      * @return get the question definition cache we are using.
      */
     protected function get_data_cache() {
-        if ($this->cache == null) {
-            $this->cache = cache::make('core', 'questiondata');
-        }
-        return $this->cache;
+        // Do not double cache here because it may break cache resetting.
+        return cache::make('core', 'questiondata');
     }
 
     /**