diff --git a/applications/osgfilecache/osgfilecache.cpp b/applications/osgfilecache/osgfilecache.cpp
index 95e151bea..8b6d56c5b 100644
--- a/applications/osgfilecache/osgfilecache.cpp
+++ b/applications/osgfilecache/osgfilecache.cpp
@@ -309,7 +309,7 @@ public:
     osg::Node* readNodeFileAndWriteToCache(const std::string& filename)
     {
         osg::Node* node = 0;
-        if (_fileCache.valid() && osgDB::containsServerAddress(filename))
+        if (_fileCache.valid() )
         {
             if (_fileCache->existsInCache(filename))
             {
diff --git a/src/osgDB/FileCache.cpp b/src/osgDB/FileCache.cpp
index 63aa745dc..175dabc85 100644
--- a/src/osgDB/FileCache.cpp
+++ b/src/osgDB/FileCache.cpp
@@ -42,8 +42,9 @@ bool FileCache::isFileAppropriateForFileCache(const std::string& originalFileNam
 
 std::string FileCache::createCacheFileName(const std::string& originalFileName) const
 {
+    std::string serverAddress = osgDB::getServerAddress(originalFileName);
     std::string cacheFileName = _fileCachePath + "/" + 
-                                osgDB::getServerAddress(originalFileName) + "/" + 
+                                serverAddress + (serverAddress.empty()?"":"/") + 
                                 osgDB::getServerFileName(originalFileName);
 
     OSG_INFO<<"FileCache::createCacheFileName("<<originalFileName<<") = "<<cacheFileName<<std::endl;