Index: /branches/release-36/php/lib/mtdb_base.php
===================================================================
--- /branches/release-36/php/lib/mtdb_base.php (revision 1986)
+++ /branches/release-36/php/lib/mtdb_base.php (revision 2049)
@@ -39,5 +39,4 @@
             'page_layout',
             'include_with_ssi',
-            'use_cache',
             'cache_expire_type',
             'cache_expire_interval',
Index: /branches/release-36/lib/MT/Upgrade.pm
===================================================================
--- /branches/release-36/lib/MT/Upgrade.pm (revision 2041)
+++ /branches/release-36/lib/MT/Upgrade.pm (revision 2049)
@@ -906,4 +906,13 @@
                     $map->file_template($file_template);
                 },
+            },
+        },
+        'core_delete_template_meta_use_cache' => {
+            version_limit => 4.0059,
+            priority      => 3.2,
+            updater       => {
+                type      => 'template',
+                label     => 'Deleting use_cache record...',
+                sql => 'delete from mt_template_meta where template_meta_type="use_cache"',
             },
         },
Index: /branches/release-36/lib/MT/CMS/Template.pm
===================================================================
--- /branches/release-36/lib/MT/CMS/Template.pm (revision 2047)
+++ /branches/release-36/lib/MT/CMS/Template.pm (revision 2049)
@@ -477,5 +477,4 @@
             $param->{include_with_ssi}      = 0;
             $param->{cache_path}            = '';
-            $param->{cache_enabled}         = 0;
             $param->{cache_expire_type}     = 0;
             $param->{cache_expire_period}   = '';
@@ -488,6 +487,4 @@
             $param->{cache_path}       = $obj->cache_path
               if defined $obj->cache_path;
-            $param->{cache_enabled} = $obj->use_cache
-              if defined $obj->use_cache;
             $param->{cache_expire_type} = $obj->cache_expire_type
               if defined $obj->cache_expire_type;
@@ -562,5 +559,5 @@
             $template_type = 'system';
         }
-        $row->{use_cache} = $obj->use_cache ? 1 : 0;
+        $row->{use_cache} = ( $obj->cache_expire_type != 0 ) ? 1 : 0;
         $row->{template_type} = $template_type;
         $row->{type} = 'entry' if $type eq 'individual';
@@ -1239,5 +1236,4 @@
     $obj->include_with_ssi( $app->param('include_with_ssi') ? 1 : 0 );
     $obj->cache_path( $app->param('cache_path'));
-    $obj->use_cache( $app->param('cache_enabled')           ? 1 : 0 );
     my $cache_expire_type = $app->param('cache_expire_type');
     $obj->cache_expire_type($cache_expire_type);
@@ -1411,5 +1407,5 @@
         my $published_url = $tmpl->published_url;
         $row->{published_url} = $published_url if $published_url;
-        $row->{use_cache} = $tmpl->use_cache ? 1 : 0;
+        $row->{use_cache} = ( $tmpl->cache_expire_type != 0 )  ? 1 : 0;
 
         # FIXME: enumeration of types
Index: /branches/release-36/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-36/lib/MT/Template/ContextHandlers.pm (revision 2033)
+++ /branches/release-36/lib/MT/Template/ContextHandlers.pm (revision 2049)
@@ -2389,5 +2389,5 @@
         || $arg->{key}
         || ( exists $arg->{ttl} )
-        || $tmpl->use_cache ) ? 1 : 0;
+        || ( $tmpl->cache_expire_type != 0 ) ) ? 1 : 0;
     my $cache_key =
         ($arg->{cache_key} || $arg->{key})
@@ -2396,9 +2396,9 @@
     my $ttl =
       exists $arg->{ttl} ? $arg->{ttl}
-          : ( $tmpl->use_cache && $tmpl->cache_expire_type == 1 ) ? $tmpl->cache_expire_interval
-              : ( $tmpl->use_cache && $tmpl->cache_expire_type == 2 ) ? 0
+          : ( $tmpl->cache_expire_type == 1 ) ? $tmpl->cache_expire_interval
+              : ( $tmpl->cache_expire_type == 2 ) ? 0
                   :   60 * 60;    # default 60 min.
 
-    if ($tmpl->use_cache && $tmpl->cache_expire_type == 2) {
+    if ( $tmpl->cache_expire_type == 2 ) {
         my @types = split /,/, ($tmpl->cache_expire_event || '');
         if (@types) {
Index: /branches/release-36/lib/MT/Template.pm
===================================================================
--- /branches/release-36/lib/MT/Template.pm (revision 1959)
+++ /branches/release-36/lib/MT/Template.pm (revision 2049)
@@ -40,5 +40,4 @@
         'page_layout' => 'string meta',
         'include_with_ssi' => 'integer meta',
-        'use_cache' => 'integer meta',
         'cache_expire_type' => 'integer meta',
         'cache_expire_interval' => 'integer meta',
Index: /branches/release-36/build/mt-dists/default.mk
===================================================================
--- /branches/release-36/build/mt-dists/default.mk (revision 2033)
+++ /branches/release-36/build/mt-dists/default.mk (revision 2049)
@@ -2,5 +2,5 @@
 
 PRODUCT_VERSION = 4.15
-SCHEMA_VERSION = 4.0058
+SCHEMA_VERSION = 4.0059
 API_VERSION = 4.15