diff --git a/includes/form_builder.admin.inc b/includes/form_builder.admin.inc
index 4175d1d..f94a74f 100644
--- a/includes/form_builder.admin.inc
+++ b/includes/form_builder.admin.inc
@@ -22,11 +22,8 @@ function form_builder_interface($form_type, $form_id) {
 
   // Load the current state of the form, or create a new cache if needed.
   $loader = FormBuilderLoader::instance();
-  $form_obj = $loader->fromCache($form_type, $form_id);
-  if (!$form_obj) {
-    $form_obj = $loader->fromStorage($form_type, $form_id);
-    $form_obj->save();
-  }
+  $form_obj = $loader->fromStorage($form_type, $form_id);
+  $form_obj->save();
 
   $output = array();
   $output[] = drupal_get_form('form_builder_preview', $form_obj, $form_type, $form_id);
diff --git a/modules/webform/form_builder_webform.module b/modules/webform/form_builder_webform.module
index cbe4560..9f7bcbb 100644
--- a/modules/webform/form_builder_webform.module
+++ b/modules/webform/form_builder_webform.module
@@ -35,8 +35,9 @@ function form_builder_webform_components_page($node) {
   $build['#attached']['js'][] = $path . '/js/select-admin.js';
   $build['#attached']['library'][] = array('system', 'ui.datepicker');
 
+  $form = drupal_get_form('form_builder_webform_save_form', $node->nid);
   $build[] = form_builder_interface('webform', $node->nid);
-  $build[] = drupal_get_form('form_builder_webform_save_form', $node->nid);
+  $build[] = $form;
 
   return $build;
 }