diff --git a/ChangeLog b/ChangeLog
index 0661dd980a..72700db1bf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 10 09:29:12 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* eval.c (rb_clear_cache_for_remove): clear entries for included
+	  module.  fixed: [ruby-core:08180]
+
 Sun Jul  9 18:06:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/mkmf.rb (try_constant): fix for value 1 at cross compiling.
diff --git a/eval.c b/eval.c
index 61f99a1c70..0457f841ac 100644
--- a/eval.c
+++ b/eval.c
@@ -365,7 +365,8 @@ rb_clear_cache_for_remove(VALUE klass, ID id)
     for (i=0; i<CACHE_SIZE; i++) {
 	for (j=0; j<2; j++) {
 	    struct cache_entry *ent = cache[j]+i;
-	    if (ent->origin == klass && ent->mid == id) {
+	    if (ent->mid == id &&
+		RCLASS(ent->origin)->m_tbl == RCLASS(klass)->m_tbl) {
 		ent->mid = 0;
 	    }
 	}