diff --git a/nagios/tasks/nagios.yml b/nagios/tasks/nagios.yml
index d759359d..27278e7a 100644
--- a/nagios/tasks/nagios.yml
+++ b/nagios/tasks/nagios.yml
@@ -1,25 +1,12 @@
 ---
 - name: Install the nagios packages
-  apt: pkg={{ item }} state=installed update_cache=yes
+  apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800
   with_items: '{{ nagios_plugins_base_pkgs }}'
   tags: nagios
 
 - name: Additional nagios plugins when available
-  apt: pkg={{ item }} state=installed
+  apt: pkg={{ item }} state=installed update_cache=yes cache_valid_time=1800
   with_items: '{{ nagios_plugins_contrib }}'
-  when: is_debian7
-  tags: [ 'nagios', 'nagios_plug_contrib' ]
-
-- name: Additional nagios plugins when available
-  apt: pkg={{ item }} state=installed
-  with_items: '{{ nagios_plugins_contrib }}'
-  when: is_debian8
-  tags: [ 'nagios', 'nagios_plug_contrib' ]
-
-- name: Additional nagios plugins when available
-  apt: pkg={{ item }} state=installed
-  with_items: '{{ nagios_plugins_contrib }}'
-  when: is_trusty
   tags: [ 'nagios', 'nagios_plug_contrib' ]
 
 - name: Create the directory where our local plugins are installed