diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue202_CacheQualifiedNamesDuringScoping_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue202_CacheQualifiedNamesDuringScoping_Test.java
new file mode 100644
index 0000000..8893bc3
--- /dev/null
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue202_CacheQualifiedNamesDuringScoping_Test.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2012 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.bugs;
+
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
+import static org.eclipse.xtext.util.Tuples.pair;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.naming.*;
+import com.google.eclipse.protobuf.protobuf.Message;
+import com.google.inject.Inject;
+
+import org.eclipse.xtext.naming.QualifiedName;
+import org.junit.*;
+
+/**
+ * Tests fix for <a href="http://code.google.com/p/protobuf-dt/issues/detail?id=202">Issue 202</a>.
+ *
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+public class Issue202_CacheQualifiedNamesDuringScoping_Test {
+  @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
+
+  @Inject private IProtobufQualifiedNameProvider provider;
+
+  private NamingStrategy namingStrategy;
+
+  @Before public void setUp() {
+    namingStrategy = mock(NamingStrategy.class);
+  }
+
+  // syntax = "proto2";
+  //
+  // package fqn.test;
+  //
+  // message Person {
+  //   optional string name = 1;
+  // }
+  @Test public void should_cache_qualified_names() {
+    Message message = xtext.find("Person", Message.class);
+    when(namingStrategy.nameOf(message)).thenReturn(pair(NameType.NORMAL, "Person"));
+    QualifiedName qualifiedName = provider.getFullyQualifiedName(message, namingStrategy);
+    assertThat(qualifiedName.toString(), equalTo("fqn.test.Person"));
+    for (int i = 0; i < 10; i++) {
+      // these calls should hit the cache
+      assertSame(qualifiedName, provider.getFullyQualifiedName(message, namingStrategy));
+    }
+    verify(namingStrategy, times(1)).nameOf(message);
+  }
+}
diff --git a/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue202_CacheQualifiedNamesDuringScoping_withIgnoredTypes_Test.java b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue202_CacheQualifiedNamesDuringScoping_withIgnoredTypes_Test.java
new file mode 100644
index 0000000..35bd00c
--- /dev/null
+++ b/com.google.eclipse.protobuf.test/src/com/google/eclipse/protobuf/bugs/Issue202_CacheQualifiedNamesDuringScoping_withIgnoredTypes_Test.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2012 Google Inc.
+ *
+ * All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package com.google.eclipse.protobuf.bugs;
+
+import static com.google.eclipse.protobuf.junit.core.UnitTestModule.unitTestModule;
+import static com.google.eclipse.protobuf.junit.core.XtextRule.overrideRuntimeModuleWith;
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertNull;
+import static org.mockito.Mockito.*;
+
+import com.google.eclipse.protobuf.junit.core.XtextRule;
+import com.google.eclipse.protobuf.naming.*;
+import com.google.eclipse.protobuf.protobuf.*;
+import com.google.inject.Inject;
+
+import org.eclipse.emf.ecore.EObject;
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.junit.runners.*;
+import org.junit.runners.Parameterized.Parameters;
+
+import java.util.Collection;
+
+/**
+ * Tests fix for <a href="http://code.google.com/p/protobuf-dt/issues/detail?id=202">Issue 202</a>.
+ *
+ * @author alruiz@google.com (Alex Ruiz)
+ */
+@RunWith(Parameterized.class)
+public class Issue202_CacheQualifiedNamesDuringScoping_withIgnoredTypes_Test {
+
+  @Parameters
+  public static Collection<Object[]> parameters() {
+    return asList(new Object[][] {
+        { Protobuf.class }, { Import.class }, { AbstractOption.class }, { OptionSource.class },
+        { ScalarTypeLink.class }, { NumberLink.class }, { BooleanLink.class }, { StringLink.class },
+        { ComplexValue.class }, { ValueField.class }, { FieldName.class }
+      });
+  }
+
+  @Rule public XtextRule xtext = overrideRuntimeModuleWith(unitTestModule());
+
+  @Inject private IProtobufQualifiedNameProvider provider;
+
+  private NamingStrategy namingStrategy;
+
+  private final EObject ignored;
+
+  public Issue202_CacheQualifiedNamesDuringScoping_withIgnoredTypes_Test(Class<EObject> ignoredType) {
+    ignored = mock(ignoredType);
+  }
+
+  @Before public void setUp() {
+    namingStrategy = mock(NamingStrategy.class);
+  }
+
+  @Test public void should_not_cache_objects_of_ignored_type() {
+    assertNull(provider.getFullyQualifiedName(ignored, namingStrategy));
+    verifyZeroInteractions(namingStrategy);
+  }
+}