diff --git a/includes/form_builder.admin.inc b/includes/form_builder.admin.inc
index 8b4470e..6649329 100644
--- a/includes/form_builder.admin.inc
+++ b/includes/form_builder.admin.inc
@@ -20,12 +20,9 @@ function form_builder_interface($form_type, $form_id) {
   // Set the current form type (used for display of the sidebar block).
   form_builder_active_form($form_type, $form_id);
 
-  // Load the current state of the form, or create a new cache if needed.
-  $form_structure = form_builder_cache_load($form_type, $form_id);
-  if (!$form_structure) {
-    $form_structure = form_builder_load_form($form_type, $form_id);
-    form_builder_cache_save($form_type, $form_id, $form_structure);
-  }
+  // Create a new empty form_builder cache.
+  $form_structure = form_builder_load_form($form_type, $form_id);
+  form_builder_cache_save($form_type, $form_id, $form_structure);
 
   $output = array();
   $output[] = drupal_get_form('form_builder_preview', $form_structure, $form_type, $form_id);
diff --git a/modules/webform/form_builder_webform.module b/modules/webform/form_builder_webform.module
index 1f767d9..c55477a 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;
 }
@@ -81,6 +82,8 @@ function form_builder_webform_save_form_submit($form, &$form_state) {
  * Save the current Form Builder interface changes for a webform node.
  */
 function form_builder_webform_save_node($node) {
+  module_load_include('inc', 'form_builder', 'includes/form_builder.api');
+  module_load_include('inc', 'form_builder', 'includes/form_builder.cache');
   $form_cache = form_builder_cache_load('webform', $node->nid);
   $element_ids = form_builder_preview_prepare($form_cache, 'webform', $node->nid);