diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 6822682f0..a7bd239ee 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -32,7 +32,7 @@
  - fix [ 1198695 ] 6.6 ß - Can't call method error on ratings.
  - fix [ 1204123 ] Bug: sortby.lastreply.url
  - fix [ 1203779 ] "Remove" Button in FileUploadControl not internationalized
-
+ - fix [ 1201650 ] Server-wide Cache can be viewed/cleared by an admin
 
 6.6.0
  - Added a shopping cart system and salable products management system. This
diff --git a/lib/WebGUI/Cache/FileCache.pm b/lib/WebGUI/Cache/FileCache.pm
index c9fe8ae67..5603f3f0d 100644
--- a/lib/WebGUI/Cache/FileCache.pm
+++ b/lib/WebGUI/Cache/FileCache.pm
@@ -90,7 +90,11 @@ Remove all objects from the filecache system.
 sub flush {
 		my $self = shift;
 		$self->SUPER::flush();
-                return $self->{_cache}->Clear;
+  	foreach my $namespace ($self->{_cache}->get_namespaces) {
+                next if ($namespace =~ /\.conf$/ && $namespace ne $session{config}{configFile});
+                $self->{_cache}->set_namespace($namespace);
+		$self->{_cache}->clear;
+        }
 }
 
 #-------------------------------------------------------------------
@@ -206,6 +210,7 @@ sub stats {
         my $output;
 	$output = "Total size of file cache: ".$self->{_cache}->Size()." bytes\n";
 	foreach my $namespace ($self->{_cache}->get_namespaces) {
+		next if ($namespace =~ /\.conf$/ && $namespace ne $session{config}{configFile});
 		$self->{_cache}->set_namespace($namespace);
 		$output .= "\t$namespace : ".($self->{_cache}->get_keys).
 				" items / ".$self->{_cache}->size()." bytes\n";