diff --git a/app/views/layouts/application-ng.rhtml b/app/views/layouts/application-ng.rhtml
index 36f671b..322df87 100644
--- a/app/views/layouts/application-ng.rhtml
+++ b/app/views/layouts/application-ng.rhtml
@@ -12,21 +12,19 @@
     <%= stylesheet_link_tag template_stylesheet_path %>
     <%= stylesheet_link_tag icon_theme_stylesheet_path %>
     <%= stylesheet_link_tag jquery_ui_theme_stylesheet_path %>
-    <% @plugins.enabled_plugins.each do |plugin| %>
-      <% if plugin.stylesheet? %>
-        <%= stylesheet_tag plugin.class.public_path('style.css'), {} %>
-      <% end %>
-    <% end %>
+    <%
+      plugins_stylesheets = @plugins.enabled_plugins.select(&:stylesheet?).map { |plugin| plugin.class.public_path('style.css') }
+    %>
+    <%= stylesheet_link_tag(plugins_stylesheets, :cache => 'cache-plugins-style-' + Digest::MD5.hexdigest(plugins_stylesheets.to_s)) unless plugins_stylesheets.empty? %>
     <%= stylesheet_link_tag theme_stylesheet_path %>
 
     <%# Add custom tags/styles/etc via content_for %>
     <%= yield :head %>
     <%= javascript_tag('render_all_jquery_ui_widgets()') %>
-    <% @plugins.enabled_plugins.each do |plugin| %>
-      <% plugin.js_files.each do |js_file| %>
-        <%= javascript_src_tag plugin.class.public_path(js_file), {} %>
-      <% end %>
-    <% end %>
+    <%
+      plugins_javascripts = @plugins.enabled_plugins.map { |plugin| plugin.js_files.map { |js| plugin.class.public_path(js) } }.flatten
+    %>
+    <%= javascript_include_tag(plugins_javascripts, :cache => 'cache-plugins-js-' + Digest::MD5.hexdigest(plugins_javascripts.to_s)) unless plugins_javascripts.empty? %>
     <%=
       @plugins.map(:head_ending).collect do |content|
         content.respond_to?(:call) ? content.call : content
--
libgit2 0.21.2