diff --git a/ang/crmUtil.js b/ang/crmUtil.js
index a8b0370ad409..ab460ab7e9c5 100644
--- a/ang/crmUtil.js
+++ b/ang/crmUtil.js
@@ -346,4 +346,16 @@
     };
   });
 
+  angular.module('crmUtil').factory('crmLoadScript', function($q) {
+    return function(url) {
+      var deferred = $q.defer();
+
+      CRM.loadScript(url).done(function() {
+        deferred.resolve(true);
+      });
+
+      return deferred.promise;
+    };
+  });
+
 })(angular, CRM.$, CRM._);
diff --git a/js/Common.js b/js/Common.js
index de326cda0e36..01bc7572bafa 100644
--- a/js/Common.js
+++ b/js/Common.js
@@ -256,7 +256,7 @@ if (!CRM.vars) CRM.vars = {};
         CRM.CMSjQuery = window.jQuery;
         window.jQuery = CRM.$;
       }
-      script.src = url;
+      script.src = url + (_.includes(url, '?') ? '&r=' : '?r=') + CRM.config.resourceCacheCode;
       document.getElementsByTagName("head")[0].appendChild(script);
     }
     return scriptsLoaded[url];