diff --git a/lib/calcms/calendar.pm b/lib/calcms/calendar.pm
index 3d91395..5131920 100644
--- a/lib/calcms/calendar.pm
+++ b/lib/calcms/calendar.pm
@@ -284,9 +284,6 @@ sub render($$$$) {
     my $template_parameters = $calendar;
     $template_parameters->{base_url}         = $config->{locations}->{base_url};
     $template_parameters->{widget_render_url}= $config->{locations}->{widget_render_url};
-    $template_parameters->{server_cache}     = $config->{cache}->{server_cache} if ( $config->{cache}->{server_cache} );
-    $template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache}
-      if ( $config->{cache}->{use_client_cache} );
 
     template::process( $config, $_[0], $parms->{template}, $template_parameters );
 }
diff --git a/lib/calcms/comments.pm b/lib/calcms/comments.pm
index fd39fe8..5673604 100644
--- a/lib/calcms/comments.pm
+++ b/lib/calcms/comments.pm
@@ -223,10 +223,6 @@ sub render($$$$) {
 
     $template_parameters->{event_id}    = $params->{event_id};
     $template_parameters->{event_start} = $params->{event_start};
-
-    $template_parameters->{server_cache} = $config->{cache}->{server_cache} if ( $config->{cache}->{server_cache} );
-    $template_parameters->{use_client_cache} = $config->{cache}->{use_client_cache}
-      if ( $config->{cache}->{use_client_cache} );
     $template_parameters->{controllers} = $config->{controllers};
     template::process( $config, $_[0], $params->{template}, $template_parameters );
 }
diff --git a/lib/calcms/events.pm b/lib/calcms/events.pm
index fe02a98..d5c0b77 100644
--- a/lib/calcms/events.pm
+++ b/lib/calcms/events.pm
@@ -1204,10 +1204,6 @@ sub render($$$$;$) {
     my %tparams = %$params;
     my $tparams = \%tparams;
     $tparams->{events}       = $results;
-    $tparams->{server_cache} = $config->{cache}->{server_cache}
-      if ( $config->{cache}->{server_cache} );
-    $tparams->{use_client_cache} = $config->{cache}->{use_client_cache}
-      if ( $config->{cache}->{use_client_cache} );
 
     if ( scalar @$results > 0 ) {
         my $result = $results->[0];
diff --git a/website/agenda/series_names.cgi b/website/agenda/series_names.cgi
index c742da5..1efebc9 100755
--- a/website/agenda/series_names.cgi
+++ b/website/agenda/series_names.cgi
@@ -37,7 +37,6 @@ my $dbh = db::connect($config);
 #fill template
 my $template_parameters = {};
 $template_parameters->{projects}         = getProjects( $dbh, $config, $params );
-$template_parameters->{server_cache}     = $config->{cache}->{server_cache} if $config->{cache}->{server_cache};
 
 #output template
 my $template = $params->{template};
diff --git a/website/agenda/templates/default/comments.xml b/website/agenda/templates/default/comments.xml
index de11102..d827bfb 100644
--- a/website/agenda/templates/default/comments.xml
+++ b/website/agenda/templates/default/comments.xml
@@ -1,5 +1,4 @@
-<TMPL_IF use_client_cache>Cache-Control: max-age=600, must-revalidate
-</TMPL_IF>Content-type:application/atom+xml; charset=UTF-8
+Content-type:application/atom+xml; charset=UTF-8
 Access-Control-Allow-Origin: *
 
 <?xml version='1.0' encoding='UTF-8'?>