1 files changed, 12 insertions, 0 deletions

diff --git a/src/main/java/cuchaz/enigma/CachingClasspathTypeLoader.java b/src/main/java/cuchaz/enigma/CachingClasspathTypeLoader.java
index 58682e23..fe13321c 100644
--- a/src/main/java/cuchaz/enigma/CachingClasspathTypeLoader.java
+++ b/src/main/java/cuchaz/enigma/CachingClasspathTypeLoader.java
@@ -8,6 +8,12 @@ import com.strobel.assembler.metadata.ITypeLoader;
  * Caching version of {@link ClasspathTypeLoader}
  */
 public class CachingClasspathTypeLoader extends CachingTypeLoader {
+        private static ITypeLoader extraClassPathLoader = null;
+
+        public static void setExtraClassPathLoader(ITypeLoader loader){
+                extraClassPathLoader = loader;
+        }
+
         private final ITypeLoader classpathLoader = new ClasspathTypeLoader();
 
         protected byte[] doLoad(String className) {
@@ -15,6 +21,12 @@ public class CachingClasspathTypeLoader extends CachingTypeLoader {
                 if (classpathLoader.tryLoadType(className, parentBuf)) {
                         return parentBuf.array();
                 }
+                if (extraClassPathLoader != null){
+                        parentBuf.reset();
+                        if (extraClassPathLoader.tryLoadType(className, parentBuf)){
+                                return parentBuf.array();
+                        }
+                }
                 return EMPTY_ARRAY;//need to return *something* as null means no store
         }
 }