Index: twitter.plugin.php
===================================================================
--- twitter.plugin.php	(revision 1788)
+++ twitter.plugin.php	(working copy)
@@ -240,12 +240,7 @@
 				$twitter_url .= '?count=1';
 			}
 
-			if (false &&  Cache::has( 'twitter_tweet_text' ) && Cache::has( 'twitter_tweet_time' ) && Cache::has( 'tweet_image_url' ) ) {
-				$block->tweet_text = Cache::get( 'twitter_tweet_text' );
-				$block->tweet_time = Cache::get( 'twitter_tweet_time' );
-				$block->tweet_image_url = Cache::get( 'tweet_image_url' );
-			}
-			else {
+			if(Cache::expired('twitter_tweet_text') || Cache::expired('twitter_tweet_time') || Cache::expired('tweet_image_url')) {
 				try {
 					$r = new RemoteRequest( $twitter_url );
 					$r->set_timeout( 10 );
@@ -285,9 +280,9 @@
 						$block->tweet_image_url = '';
 					}
 					// Cache (even errors) to avoid hitting rate limit.
-					Cache::set( 'twitter_tweet_text', $block->tweet_text, Options::get( 'twitter__cache' ) );
-					Cache::set( 'twitter_tweet_time', $block->tweet_time, Options::get( 'twitter__cache' ) );
-					Cache::set( 'tweet_image_url', $block->tweet_image_url, Options::get( 'twitter__cache' ) );
+					Cache::set( 'twitter_tweet_text', $block->tweet_text, Options::get( 'twitter__cache' ), true );
+					Cache::set( 'twitter_tweet_time', $block->tweet_time, Options::get( 'twitter__cache' ), true );
+					Cache::set( 'tweet_image_url', $block->tweet_image_url, Options::get( 'twitter__cache' ), true );
 				}
 				catch ( Exception $e ) {
 					$block->tweet_text = 'Unable to contact Twitter.';
@@ -295,6 +290,11 @@
 					$block->tweet_image_url = '';
 				}
 			}
+			if (Cache::has( 'twitter_tweet_text' ) && Cache::has( 'twitter_tweet_time' ) && Cache::has( 'tweet_image_url' ) ) {
+				$block->tweet_text = Cache::get( 'twitter_tweet_text' );
+				$block->tweet_time = Cache::get( 'twitter_tweet_time' );
+				$block->tweet_image_url = Cache::get( 'tweet_image_url' );
+			}
 		}
 		else {
 			$block->tweet_text = _t(
@@ -419,4 +419,4 @@
 	}
 }
 
-?>
\ No newline at end of file
+?>