diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index 50e750bf74..2dcdb49f36 100644
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -2090,23 +2090,25 @@ afsd_run(void)
 	       cacheFiles, inode_for_V, (cacheFiles * sizeof(AFSD_INO_T)));
 #endif
 
-    /*
-     * Set up all the pathnames we'll need for later.
-     */
-    sprintf(fullpn_DCacheFile, "%s/%s", cacheBaseDir, DCACHEFILE);
-    sprintf(fullpn_VolInfoFile, "%s/%s", cacheBaseDir, VOLINFOFILE);
-    sprintf(fullpn_CellInfoFile, "%s/%s", cacheBaseDir, CELLINFOFILE);
-    sprintf(fullpn_VFile, "%s/", cacheBaseDir);
-    vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
+    if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)) {
+	/*
+	 * Set up all the pathnames we'll need for later.
+	 */
+	sprintf(fullpn_DCacheFile, "%s/%s", cacheBaseDir, DCACHEFILE);
+	sprintf(fullpn_VolInfoFile, "%s/%s", cacheBaseDir, VOLINFOFILE);
+	sprintf(fullpn_CellInfoFile, "%s/%s", cacheBaseDir, CELLINFOFILE);
+	sprintf(fullpn_VFile, "%s/", cacheBaseDir);
+	vFilePtr = fullpn_VFile + strlen(fullpn_VFile);
 
-    if (!(cacheFlags & AFSCALL_INIT_MEMCACHE)
-	&& (fsTypeMsg = CheckCacheBaseDir(cacheBaseDir))) {
+	fsTypeMsg = CheckCacheBaseDir(cacheBaseDir);
+	if (fsTypeMsg) {
 #ifdef AFS_SUN5_ENV
-	printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
+	    printf("%s: WARNING: Cache dir check failed (%s)\n", rn, fsTypeMsg);
 #else
-	printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg);
-	exit(1);
+	    printf("%s: ERROR: Cache dir check failed (%s)\n", rn, fsTypeMsg);
+	    exit(1);
 #endif
+	}
     }
 
     /*