diff --git a/waffle/models.py b/waffle/models.py
index 00c7c7b2..fa76b6eb 100644
--- a/waffle/models.py
+++ b/waffle/models.py
@@ -56,13 +56,6 @@ def get_from_db(cls, name):
         objects = cls.objects
         if get_setting('READ_FROM_WRITE_DB'):
             objects = objects.using(router.db_for_write(cls))
-
-        if get_setting('CREATE_MISSING_FLAGS'):
-            flag, _created = objects.get_or_create(
-                name=name, defaults={'everyone': get_setting('FLAG_DEFAULT')}
-            )
-            return flag
-
         return objects.get(name=name)
 
     @classmethod
@@ -254,6 +247,16 @@ def is_active(self, request):
             log_level = get_setting('LOG_MISSING_FLAGS')
             if log_level:
                 logger.log(log_level, 'Flag %s not found', self.name)
+            if get_setting('CREATE_MISSING_FLAGS'):
+                flag, _created = get_waffle_flag_model().objects.get_or_create(
+                    name=self.name,
+                    defaults={
+                        'everyone': get_setting('FLAG_DEFAULT')
+                    }
+                )
+                cache = get_cache()
+                cache.set(self._cache_key(self.name), flag)
+
             return get_setting('FLAG_DEFAULT')
 
         if get_setting('OVERRIDE'):
diff --git a/waffle/tests/test_waffle.py b/waffle/tests/test_waffle.py
index 684f0809..1b906eed 100644
--- a/waffle/tests/test_waffle.py
+++ b/waffle/tests/test_waffle.py
@@ -441,16 +441,6 @@ def test_flag_created_dynamically_default_false(self):
     def test_flag_created_dynamically_default_true(self):
         self.assert_flag_dynamically_created_with_value(True)
 
-    @override_settings(WAFFLE_CREATE_MISSING_FLAGS=True)
-    @override_settings(WAFFLE_FLAG_DEFAULT=True)
-    def test_flag_created_dynamically_upon_retrieval(self):
-        FLAG_NAME = 'myflag'
-        flag_model = waffle.get_waffle_flag_model()
-        flag = flag_model.get(FLAG_NAME)
-
-        assert flag.is_active(get())
-        assert flag_model.objects.filter(name=FLAG_NAME).exists()
-
     @mock.patch('waffle.models.logger')
     def test_no_logging_missing_flag_by_default(self, mock_logger):
         request = get()