diff --git a/browser/form.py b/browser/form.py
index 65e6ca4..285a91d 100644
--- a/browser/form.py
+++ b/browser/form.py
@@ -65,6 +65,9 @@ class ObjectForm(NodeView):
             wc.modifyWidgetSetup(self.widgets)
 
     def __call__(self):
+        response = self.request.response
+        response.setHeader('Expires', 'Sat, 1 Jan 2000 00:00:00 GMT')
+        response.setHeader('Pragma', 'no-cache')
         return innerHtml(self)
 
     @Lazy
@@ -131,7 +134,7 @@ class CreateObjectForm(ObjectForm, Form):
         self.typeInterface = ifc
         return FormFields(ifc)
 
-    #@property
+    @property
     def assignments(self):
         target = self.virtualTargetObject
         if (IConcept.providedBy(target) and
diff --git a/browser/form_macros.pt b/browser/form_macros.pt
index a34c7d7..4b9cdd0 100644
--- a/browser/form_macros.pt
+++ b/browser/form_macros.pt
@@ -1,7 +1,7 @@
 <metal:block define-macro="edit">
-    <form method="post" action="." enctype="multipart/form-data">
+    <form method="post" enctype="multipart/form-data">
       <input type="hidden" name="form.action" value="edit"
-               tal:attributes="value view/form_action" />
+             tal:attributes="value view/form_action" />
       <table cellpadding="3" class="form">
         <tbody>
           <tr>
@@ -38,7 +38,7 @@
 
 
 <metal:block define-macro="create">
-    <form method="post" action="." enctype="multipart/form-data">
+    <form method="post" enctype="multipart/form-data">
       <input type="hidden" name="form.action" value="create"
              tal:attributes="value view/form_action" />
       <table cellpadding="3" class="form">