Index: ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb
===================================================================
diff -u -r1693 -r1707
--- ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb	(.../CacheMapper.vb)	(revision 1693)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/mappers/CacheMapper.vb	(.../CacheMapper.vb)	(revision 1707)
@@ -11,9 +11,10 @@
     Private Sub ConnectToCache()
         Try
             If _sqlConnection Is Nothing Then
-                'Build connection string. Looks something like this "DSN=...; DRIVER={InterSystems ODBC}; SERVER=CACHE01;DATABASE=ADMIN1;UID=...;PWD=..."
-                Dim connectionString = $"DSN={My.Resources.CacheSQLConnection}; DRIVER=" & "{InterSystems ODBC}" &
-                                       $"; SERVER=CACHE01;DATABASE=ADMIN1;UID={My.Resources.CacheUsername};PWD={My.Resources.CachePassword}"
+                'Build connection string. Looks something like this "DSN=...; DRIVER={InterSystems ODBC}; SERVER=...;DATABASE=...;UID=...;PWD=..."
+                Dim connectionString = $"DSN={My.Resources.CacheDSN}; DRIVER=" & "{InterSystems ODBC}; 
+                SERVER={My.Resources.CacheServerName};DATABASE={My.Resources.CacheDatabase};
+                UID={My.Resources.CacheUsername};PWD={My.Resources.CachePassword}"
                 'Initialise connection.
                 _sqlConnection = New OdbcConnection(connectionString)
             End If
Index: ActiviteitenOpvolging/ActiviteitenOpvolging/My Project/Resources.Designer.vb
===================================================================
diff -u -r1706 -r1707
--- ActiviteitenOpvolging/ActiviteitenOpvolging/My Project/Resources.Designer.vb	(.../Resources.Designer.vb)	(revision 1706)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/My Project/Resources.Designer.vb	(.../Resources.Designer.vb)	(revision 1707)
@@ -61,6 +61,24 @@
         End Property
         
         '''<summary>
+        '''  Looks up a localized string similar to ADMIN1.
+        '''</summary>
+        Friend ReadOnly Property CacheDatabase() As String
+            Get
+                Return ResourceManager.GetString("CacheDatabase", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Looks up a localized string similar to Cache01Admin1.
+        '''</summary>
+        Friend ReadOnly Property CacheDSN() As String
+            Get
+                Return ResourceManager.GetString("CacheDSN", resourceCulture)
+            End Get
+        End Property
+        
+        '''<summary>
         '''  Looks up a localized string similar to fixed.
         '''</summary>
         Friend ReadOnly Property CachePassword() As String
@@ -70,11 +88,11 @@
         End Property
         
         '''<summary>
-        '''  Looks up a localized string similar to Cache01Admin1.
+        '''  Looks up a localized string similar to CACHE01.
         '''</summary>
-        Friend ReadOnly Property CacheSQLConnection() As String
+        Friend ReadOnly Property CacheServerName() As String
             Get
-                Return ResourceManager.GetString("CacheSQLConnection", resourceCulture)
+                Return ResourceManager.GetString("CacheServerName", resourceCulture)
             End Get
         End Property
         
Index: ActiviteitenOpvolging/ActiviteitenOpvolging/My Project/Resources.resx
===================================================================
diff -u -r1706 -r1707
--- ActiviteitenOpvolging/ActiviteitenOpvolging/My Project/Resources.resx	(.../Resources.resx)	(revision 1706)
+++ ActiviteitenOpvolging/ActiviteitenOpvolging/My Project/Resources.resx	(.../Resources.resx)	(revision 1707)
@@ -117,13 +117,21 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="CacheDatabase" xml:space="preserve">
+    <value>ADMIN1</value>
+    <comment>The name of the Caché database</comment>
+  </data>
+  <data name="CacheDSN" xml:space="preserve">
+    <value>Cache01Admin1</value>
+    <comment>The name of the DSN for the Caché database</comment>
+  </data>
   <data name="CachePassword" xml:space="preserve">
     <value>fixed</value>
     <comment>The password for the Caché database</comment>
   </data>
-  <data name="CacheSQLConnection" xml:space="preserve">
-    <value>Cache01Admin1</value>
-    <comment>The name of the connection for the Caché database</comment>
+  <data name="CacheServerName" xml:space="preserve">
+    <value>CACHE01</value>
+    <comment>The name of the server for the Caché database</comment>
   </data>
   <data name="CacheUsername" xml:space="preserve">
     <value>ICT_READONLY</value>