Index: /trunk/xpressme_integration_kit/include/xpress_block_render.php
===================================================================
--- /trunk/xpressme_integration_kit/include/xpress_block_render.php	(revision 481)
+++ /trunk/xpressme_integration_kit/include/xpress_block_render.php	(revision 482)
@@ -188,5 +188,5 @@
 		$call_url = $_SERVER['REQUEST_URI'];
 		xpress_block_css_set($mydirname);
-		if (strstr($call_url,$this_url)){	
+		if (strcmp($call_url,$this_url)==0){
 			$block_theme_file = get_block_file_path($mydirname,$inc_theme_file_name);
 			require_once $block_theme_file['file_path'];
@@ -315,5 +315,5 @@
         if ($dh = opendir($cache_dir)) {
             while (($file = readdir($dh)) !== false) {
-                if (preg_match('/^' . preg_quote($mydirname) . '/', $file)) {
+                if (preg_match('/^' . preg_quote($mydirname) . '_/', $file)) {
                 	if(! preg_match('/' . $pattern . '/', $file)) {
                     	unlink($cache_dir.$file);