diff --git a/subform.module b/subform.module
index 1b952d1..374380c 100644
--- a/subform.module
+++ b/subform.module
@@ -305,9 +305,12 @@ function subform_element_rebuild($element, &$form_state) {
 
   subform_buffer('start', $element);
   {
-    // TODO prevent caching in drupal_rebuild_form() as we are doing it later
+    // prevent caching in drupal_rebuild_form() as we are doing it later
     // in subform_parent_after_build().
+    $nocache = !empty($subform_state['no_cache']);
+    $subform_state['no_cache'] = TRUE;
     $element['#subform'] = drupal_rebuild_form($element['#subform_id'], $subform_state, $old_subform);
+    $subform_state['no_cache'] = $nocache;
   }
   subform_buffer('end', $element, TRUE);