LGTM++ Thanks, this is much better. http://codereview.appspot.com/4748053/diff/9001/java/gadgets/src/main/java/or... File java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java (right): http://codereview.appspot.com/4748053/diff/9001/java/gadgets/src/main/java/or... java/gadgets/src/main/java/org/apache/shindig/gadgets/js/DeferredExportJsProcessor.java:63: featureRegistry = featureRegistryProvider.get(jsUri.getRepository()); for later, we might consider adding this to JsRequest itself, since we now precompute the requested/new/existing list there as well (it's a common pattern).