diff --git a/website/agenda/config/config.cgi.off b/website/agenda/config/config.cgi.off
index d403f16..3058341 100755
--- a/website/agenda/config/config.cgi.off
+++ b/website/agenda/config/config.cgi.off
@@ -43,7 +43,6 @@ domain ${DOMAIN}
- use_client_cache 0
base_url /programm
diff --git a/website/agenda/planung/templates/autotext.json b/website/agenda/planung/templates/autotext.json
index 4801981..8f37026 100644
--- a/website/agenda/planung/templates/autotext.json
+++ b/website/agenda/planung/templates/autotext.json
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:application/json; charset=UTF-8;
+Content-type:application/json; charset=UTF-8;
[
{"id":"", "label":"", "value":""} ,
diff --git a/website/agenda/series_names.cgi b/website/agenda/series_names.cgi
index 16ad8c0..38b9d9d 100755
--- a/website/agenda/series_names.cgi
+++ b/website/agenda/series_names.cgi
@@ -40,7 +40,6 @@ my $template_parameters = {};
$template_parameters->{projects} = getProjects( $dbh, $config, $params );
$template_parameters->{debug} = $config->{system}->{debug};
$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};
#output template
my $template = $params->{template};
diff --git a/website/agenda/templates/default/calendar.html b/website/agenda/templates/default/calendar.html
index 17dc5c2..588c24c 100644
--- a/website/agenda/templates/default/calendar.html
+++ b/website/agenda/templates/default/calendar.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/categories.html b/website/agenda/templates/default/categories.html
index 85f9c61..be09bb6 100644
--- a/website/agenda/templates/default/categories.html
+++ b/website/agenda/templates/default/categories.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
diff --git a/website/agenda/templates/default/comments.html b/website/agenda/templates/default/comments.html
index 018b0b3..ea59a4b 100644
--- a/website/agenda/templates/default/comments.html
+++ b/website/agenda/templates/default/comments.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=5, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/comments_newest.html b/website/agenda/templates/default/comments_newest.html
index 33bca65..7bb95f5 100644
--- a/website/agenda/templates/default/comments_newest.html
+++ b/website/agenda/templates/default/comments_newest.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event.atom.xml b/website/agenda/templates/default/event.atom.xml
index ce8a9d4..b9b1f7e 100644
--- a/website/agenda/templates/default/event.atom.xml
+++ b/website/agenda/templates/default/event.atom.xml
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/atom+xml; charset=UTF-8
+Content-type:application/atom+xml; charset=UTF-8
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event.ics b/website/agenda/templates/default/event.ics
index 5f45ded..a2872db 100644
--- a/website/agenda/templates/default/event.ics
+++ b/website/agenda/templates/default/event.ics
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-Type:text/calendar; charset="UTF-8"
+Content-Type:text/calendar; charset="UTF-8"
Content-Disposition: attachment; filename="-programm.ics"
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event.json-p b/website/agenda/templates/default/event.json-p
index 3a0b3db..817034d 100644
--- a/website/agenda/templates/default/event.json-p
+++ b/website/agenda/templates/default/event.json-p
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/json; charset=UTF-8
+Content-type:application/json; charset=UTF-8
Access-Control-Allow-Origin: *
if(typeof(Feed) == 'undefined') Feed = {};
diff --git a/website/agenda/templates/default/event.rss.xml b/website/agenda/templates/default/event.rss.xml
index 579bc24..a0321c7 100644
--- a/website/agenda/templates/default/event.rss.xml
+++ b/website/agenda/templates/default/event.rss.xml
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/rss+xml; charset=UTF-8
+Content-type:application/rss+xml; charset=UTF-8
diff --git a/website/agenda/templates/default/event_dashboard.html.js b/website/agenda/templates/default/event_dashboard.html.js
index 73c5b49..4c3394c 100644
--- a/website/agenda/templates/default/event_dashboard.html.js
+++ b/website/agenda/templates/default/event_dashboard.html.js
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:application/json; charset=UTF-8;
+Content-type:application/json; charset=UTF-8;
Access-Control-Allow-Origin: *
[
diff --git a/website/agenda/templates/default/event_details.html b/website/agenda/templates/default/event_details.html
index ace3d69..32d4926 100644
--- a/website/agenda/templates/default/event_details.html
+++ b/website/agenda/templates/default/event_details.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=utf-8;
+Content-type:text/html; charset=utf-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event_file_export.txt b/website/agenda/templates/default/event_file_export.txt
index 00ebd4d..5ce3ae1 100644
--- a/website/agenda/templates/default/event_file_export.txt
+++ b/website/agenda/templates/default/event_file_export.txt
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/plain; charset=utf-8;
+Content-type:text/plain; charset=utf-8;
$events=[
diff --git a/website/agenda/templates/default/event_list.html b/website/agenda/templates/default/event_list.html
index 9f68238..cb6abc7 100644
--- a/website/agenda/templates/default/event_list.html
+++ b/website/agenda/templates/default/event_list.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=utf-8;
+Content-type:text/html; charset=utf-8;
diff --git a/website/agenda/templates/default/event_media.rss.xml b/website/agenda/templates/default/event_media.rss.xml
index 67d299e..b4cab4c 100644
--- a/website/agenda/templates/default/event_media.rss.xml
+++ b/website/agenda/templates/default/event_media.rss.xml
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/rss+xml; charset=UTF-8
+Content-type:application/rss+xml; charset=UTF-8
Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
diff --git a/website/agenda/templates/default/event_perl.txt b/website/agenda/templates/default/event_perl.txt
index ed8bf65..fac8cab 100644
--- a/website/agenda/templates/default/event_perl.txt
+++ b/website/agenda/templates/default/event_perl.txt
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/plain; charset=utf-8;
+Content-type:text/plain; charset=utf-8;
$events=[
diff --git a/website/agenda/templates/default/event_playlist.html b/website/agenda/templates/default/event_playlist.html
index b2a7cf7..ea8cdf8 100644
--- a/website/agenda/templates/default/event_playlist.html
+++ b/website/agenda/templates/default/event_playlist.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
diff --git a/website/agenda/templates/default/event_playlist.txt b/website/agenda/templates/default/event_playlist.txt
index 3762ebe..feea00e 100644
--- a/website/agenda/templates/default/event_playlist.txt
+++ b/website/agenda/templates/default/event_playlist.txt
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/plain; charset=UTF-8;
+Content-type:text/plain; charset=UTF-8;
Access-Control-Allow-Origin: *
Andere Veranstalter
diff --git a/website/agenda/templates/default/event_playlist_long.html b/website/agenda/templates/default/event_playlist_long.html
index 9394f65..1e799e6 100644
--- a/website/agenda/templates/default/event_playlist_long.html
+++ b/website/agenda/templates/default/event_playlist_long.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event_playlist_show.html b/website/agenda/templates/default/event_playlist_show.html
index 750bfec..6dacfdb 100644
--- a/website/agenda/templates/default/event_playlist_show.html
+++ b/website/agenda/templates/default/event_playlist_show.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event_rds.txt b/website/agenda/templates/default/event_rds.txt
index f09a13f..c85e231 100644
--- a/website/agenda/templates/default/event_rds.txt
+++ b/website/agenda/templates/default/event_rds.txt
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/plain; charset=UTF-8;
+Content-type:text/plain; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event_redirect.html b/website/agenda/templates/default/event_redirect.html
index 619e254..2a0a2b5 100644
--- a/website/agenda/templates/default/event_redirect.html
+++ b/website/agenda/templates/default/event_redirect.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
diff --git a/website/agenda/templates/default/event_running.html b/website/agenda/templates/default/event_running.html
index b3ffc98..2f8cf3e 100644
--- a/website/agenda/templates/default/event_running.html
+++ b/website/agenda/templates/default/event_running.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/event_utc_time.json b/website/agenda/templates/default/event_utc_time.json
index 41c1be4..3a534aa 100644
--- a/website/agenda/templates/default/event_utc_time.json
+++ b/website/agenda/templates/default/event_utc_time.json
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/json; charset=utf-8;
+Content-type:application/json; charset=utf-8;
Access-Control-Allow-Origin: *
{
diff --git a/website/agenda/templates/default/events_playout.json b/website/agenda/templates/default/events_playout.json
index 600a087..9970e3a 100644
--- a/website/agenda/templates/default/events_playout.json
+++ b/website/agenda/templates/default/events_playout.json
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/json; charset=UTF-8
+Content-type:application/json; charset=UTF-8
Access-Control-Allow-Origin: *
("events" : ["event":{"id" : ""},])
diff --git a/website/agenda/templates/default/events_playout.json-p b/website/agenda/templates/default/events_playout.json-p
index e27220f..3bf4051 100644
--- a/website/agenda/templates/default/events_playout.json-p
+++ b/website/agenda/templates/default/events_playout.json-p
@@ -1,5 +1,4 @@
-Cache-Control: max-age=600, must-revalidate
-Content-type:application/json; charset=UTF-8
+Content-type:application/json; charset=UTF-8
Access-Control-Allow-Origin: *
"events" : {
diff --git a/website/agenda/templates/default/series_names.html b/website/agenda/templates/default/series_names.html
index 750f332..6743ab0 100644
--- a/website/agenda/templates/default/series_names.html
+++ b/website/agenda/templates/default/series_names.html
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:text/html; charset=UTF-8;
+Content-type:text/html; charset=UTF-8;
Access-Control-Allow-Origin: *
diff --git a/website/agenda/templates/default/series_names.js b/website/agenda/templates/default/series_names.js
index 1263306..884cf36 100644
--- a/website/agenda/templates/default/series_names.js
+++ b/website/agenda/templates/default/series_names.js
@@ -1,5 +1,4 @@
-Cache-Control: max-age=3600, must-revalidate
-Content-type:application/json; charset=UTF-8;
+Content-type:application/json; charset=UTF-8;
Access-Control-Allow-Origin: *
[