diff --git a/patches/blockcache_alter_no_node_grants.patch b/patches/blockcache_alter_no_node_grants.patch
index c9f4e6c..fa1416c 100644
--- a/patches/blockcache_alter_no_node_grants.patch
+++ b/patches/blockcache_alter_no_node_grants.patch
@@ -1,6 +1,8 @@
---- block.module.orig	2009-03-08 19:34:38.000000000 +0100
-+++ block.module	2009-03-18 00:06:11.000000000 +0100
-@@ -454,6 +454,7 @@
+diff --git a/modules/block/block.module b/modules/block/block.module
+index 9eecda7..c74d012 100644
+--- a/modules/block/block.module
++++ b/modules/block/block.module
+@@ -503,6 +503,7 @@ function block_list($region) {
      $blocks[$region] = array();
    }
  
@@ -8,14 +10,12 @@
    foreach ($blocks[$region] as $key => $block) {
      // Render the block content if it has not been created already.
      if (!isset($block->content)) {
-@@ -466,13 +467,23 @@
+@@ -515,13 +516,23 @@ function block_list($region) {
            // Try fetching the block from cache. Block caching is not compatible with
            // node_access modules. We also preserve the submission of forms in blocks,
            // by fetching from cache only if the request method is 'GET'.
 -          if (!count(module_implements('node_grants')) && $_SERVER['REQUEST_METHOD'] == 'GET' && ($cid = _block_get_cache_id($block)) && ($cache = cache_get($cid, 'cache_block'))) {
-+          if ($_SERVER['REQUEST_METHOD'] == 'GET' &&
-+            ($cid = _block_get_cache_id($block)) && ($cache = cache_get($cid, 'cache_block')) &&
-+            (_blockcache_alter_check_expire($cache, $time))) {
++          if ($_SERVER['REQUEST_METHOD'] == 'GET' && ($cid = _block_get_cache_id($block)) && ($cache = cache_get($cid, 'cache_block')) && (_blockcache_alter_check_expire($cache, $time))) {
              $array = $cache->data;
            }
            else {
@@ -24,10 +24,12 @@
 -              cache_set($cid, $array, 'cache_block', CACHE_TEMPORARY);
 +              $blocklife = variable_get('bc_life_' . $block->module .'_' . $block->delta, '');
 +              $blocklife = (int)$blocklife;
-+              if (!empty($blocklife))
-+              cache_set($cid, $array, 'cache_block', $blocklife + time());
-+              else
-+              cache_set($cid, $array, 'cache_block', CACHE_PERMANENT);
++              if (!empty($blocklife)) {
++                cache_set($cid, $array, 'cache_block', $blocklife + time());
++              }
++              else {
++                cache_set($cid, $array, 'cache_block', CACHE_PERMANENT);
++              }
 +              if (variable_get('bca_debug', FALSE) && user_access('administer site configuration')) {
 +                drupal_set_message('Block re-cached: ' . $block->title . '_' .$block->module . '_' . $block->delta . '_' . $blocklife . '_' . time());
 +              }
diff --git a/patches/blockcache_alter_with_node_grants.patch b/patches/blockcache_alter_with_node_grants.patch
index dfa23df..6d7a7ff 100644
--- a/patches/blockcache_alter_with_node_grants.patch
+++ b/patches/blockcache_alter_with_node_grants.patch
@@ -1,5 +1,5 @@
---- block.module.d622	2011-05-27 14:04:12.000000000 +0530
-+++ block.module.new	2011-05-26 17:17:24.000000000 +0530
+--- block.module 2011-05-27 14:04:12.000000000 +0530
++++ block.module 2011-05-26 17:17:24.000000000 +0530
 @@ -503,6 +503,7 @@ function block_list($region) {
      $blocks[$region] = array();
    }