Merge "Fix a bug in AddToCodeCache"