diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 86bf7aeac..5a8f33b83 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -26,6 +26,7 @@
  - Added Export Page functionality.
  - bugfix: Loginbox didn't support encrypt login.
  - Bugfix: [ 1000205 ] Password Recovery Doesn't Work
+ - Bugfix: [ 1003594 ] Fixed Navigation Cacheing bug
 
 6.1.1
  - bugfix [ 991313 ] Manage Translations doesn't work
diff --git a/lib/WebGUI/Navigation.pm b/lib/WebGUI/Navigation.pm
index 972516eb1..bc22692ad 100644
--- a/lib/WebGUI/Navigation.pm
+++ b/lib/WebGUI/Navigation.pm
@@ -228,19 +228,18 @@ sub build {
 
 	my (@page_loop, $lastPage, %unfolded);
 	tie %unfolded, "Tie::IxHash";
+
+        # Store current page properties in template var
+        my $currentPage = WebGUI::Page->getPage();
+        foreach my $property (@interestingPageProperties) {
+        	$var->{'page.current.'.$property} = $currentPage->get($property);
+        }
 	unless (defined $cacheContent && ! $session{var}{altSiteURL}) {
 		# The loop was not cached
 		my @pages = eval $method;
 		if ($@) {
 			WebGUI::ErrorHandler::warn("Error in WebGUI::Navigation::build while trying to execute $method".$@);
 		}
-
-		# Store current page properties in template var
-		my $currentPage = WebGUI::Page->getPage();
-		foreach my $property (@interestingPageProperties) {
-			$var->{'page.current.'.$property} = $currentPage->get($property);
-		}
-
 		if (@pages) {
 			my $startPageDepth = ($p->ancestors);
 			my $maxDepth = $startPageDepth + $self->{_depth};