diff --git a/ChangeLog b/ChangeLog
index 45a1b66b4e..f531fae700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu May  5 17:36:31 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
+
+	* eval.c (frame_func_id): store result of method_entry_of_iseq() to
+	  cfp->me because method_entry_of_iseq() might become expensive.
+
 Thu May  5 15:03:51 2011  CHIKANAGA Tomoyuki  <nagachika00@gmail.com>
 
 	* eval.c (frame_func_id): __method__ return different name from
diff --git a/eval.c b/eval.c
index de9f6f5785..2d07719e87 100644
--- a/eval.c
+++ b/eval.c
@@ -784,6 +784,7 @@ frame_func_id(rb_control_frame_t *cfp)
 	}
 	me_local = method_entry_of_iseq(cfp, iseq);
 	if (me_local) {
+	    cfp->me = me_local;
 	    return me_local->def->original_id;
 	}
 	if (iseq->defined_method_id) {