diff --git a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
index 6fdc5431de6..1982602dc54 100644
--- a/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
+++ b/ReactAndroid/src/androidTest/java/com/facebook/react/testing/ReactAppTestActivity.java
@@ -23,6 +23,7 @@ import com.facebook.react.bridge.JSIModule;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.JSIModuleSpec;
+import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -239,8 +240,8 @@ public class ReactAppTestActivity extends FragmentActivity
                 return Arrays.<JSIModuleSpec>asList(
                     new JSIModuleSpec() {
                       @Override
-                      public Class<? extends JSIModule> getJSIModuleClass() {
-                        return UIManager.class;
+                      public JSIModuleType getJSIModuleType() {
+                        return JSIModuleType.UIManager;
                       }
 
                       @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
index 69751f22508..4ee84ea0675 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstance.java
@@ -66,7 +66,7 @@ public interface CatalystInstance
   <T extends NativeModule> boolean hasNativeModule(Class<T> nativeModuleInterface);
   <T extends NativeModule> T getNativeModule(Class<T> nativeModuleInterface);
   NativeModule getNativeModule(String moduleName);
-  <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface);
+  JSIModule getJSIModule(JSIModuleType moduleType);
   Collection<NativeModule> getNativeModules();
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
index 1933f10ae70..05720aa72c8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/CatalystInstanceImpl.java
@@ -511,8 +511,8 @@ public class CatalystInstanceImpl implements CatalystInstance {
   }
 
   @Override
-  public <T extends JSIModule> T getJSIModule(Class<T> jsiModuleInterface) {
-    return mJSIModuleRegistry.getModule(jsiModuleInterface);
+  public JSIModule getJSIModule(JSIModuleType moduleType) {
+    return mJSIModuleRegistry.getModule(moduleType);
   }
 
   private native long getJavaScriptContext();
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
index c90d4007762..46c7868f727 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleRegistry.java
@@ -14,21 +14,21 @@ import java.util.Map;
 
 public class JSIModuleRegistry {
 
-  private final Map<Class, JSIModuleHolder> mModules = new HashMap<>();
+  private final Map<JSIModuleType, JSIModuleHolder> mModules = new HashMap<>();
 
   public JSIModuleRegistry() { }
 
-  public <T extends JSIModule> T getModule(Class<T> moduleClass) {
-    JSIModuleHolder jsiModuleHolder = mModules.get(moduleClass);
+  public JSIModule getModule(JSIModuleType moduleType) {
+    JSIModuleHolder jsiModuleHolder = mModules.get(moduleType);
     if (jsiModuleHolder == null) {
-      throw new IllegalArgumentException("Unable to find JSIModule for class " + moduleClass);
+      throw new IllegalArgumentException("Unable to find JSIModule for class " + moduleType);
     }
-    return (T) Assertions.assertNotNull(jsiModuleHolder.getJSIModule());
+    return Assertions.assertNotNull(jsiModuleHolder.getJSIModule());
   }
 
   public void registerModules(List<JSIModuleSpec> jsiModules) {
     for (JSIModuleSpec spec : jsiModules) {
-      mModules.put(spec.getJSIModuleClass(), new JSIModuleHolder(spec));
+      mModules.put(spec.getJSIModuleType(), new JSIModuleHolder(spec));
     }
   }
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleSpec.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleSpec.java
index 1178921292e..2e8379f7fcd 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleSpec.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleSpec.java
@@ -12,7 +12,7 @@ package com.facebook.react.bridge;
  */
 public interface JSIModuleSpec<T extends JSIModule> {
 
-  Class<? extends JSIModule> getJSIModuleClass();
+  JSIModuleType getJSIModuleType();
 
   JSIModuleProvider<T> getJSIModuleProvider();
 
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleType.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleType.java
new file mode 100644
index 00000000000..99fb9b3e8c5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JSIModuleType.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.bridge;
+
+/**
+ * A list of support JSIModules. These are usually core infra pieces, so there
+ * should be an explicit list.
+ */
+public enum JSIModuleType {
+  TurboModuleManager,
+  UIManager,
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java
index 6c4219e1e6e..406989e1576 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerHelper.java
@@ -12,6 +12,7 @@ import static com.facebook.react.uimanager.common.UIManagerType.DEFAULT;
 import static com.facebook.react.uimanager.common.ViewUtil.getUIManagerType;
 
 import com.facebook.react.bridge.CatalystInstance;
+import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.uimanager.common.UIManagerType;
@@ -34,7 +35,7 @@ public class UIManagerHelper {
   public static UIManager getUIManager(ReactContext context, @UIManagerType int uiManagerType) {
     CatalystInstance catalystInstance = context.getCatalystInstance();
     return uiManagerType == FABRIC ?
-      catalystInstance.getJSIModule(UIManager.class) :
+      (UIManager)catalystInstance.getJSIModule(JSIModuleType.UIManager) :
       catalystInstance.getNativeModule(UIManagerModule.class);
   }