diff --git a/src/viewport.cpp b/src/viewport.cpp
--- a/src/viewport.cpp
+++ b/src/viewport.cpp
@@ -1171,10 +1171,10 @@ static void ViewportAddTownNames(DrawPix
 
 	const Town *t;
 	FOR_ALL_TOWNS(t) {
-		ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &t->sign,
+		ViewportAddString(dpi, ZOOM_LVL_OUT_16X, &t->cache.sign,
 				_settings_client.gui.population_in_label ? STR_VIEWPORT_TOWN_POP : STR_VIEWPORT_TOWN,
 				STR_VIEWPORT_TOWN_TINY_WHITE, STR_VIEWPORT_TOWN_TINY_BLACK,
-				t->index, t->population);
+				t->index, t->cache.population);
 	}
 }
 
@@ -1865,7 +1865,7 @@ static bool CheckClickOnTown(const ViewP
 
 	const Town *t;
 	FOR_ALL_TOWNS(t) {
-		if (CheckClickOnViewportSign(vp, x, y, &t->sign)) {
+		if (CheckClickOnViewportSign(vp, x, y, &t->cache.sign)) {
 			ShowTownViewWindow(t->index);
 			return true;
 		}