diff --git a/packages/server/healthchecks/postgres.ts b/packages/server/healthchecks/postgres.ts
index dd82ce0c08..cc1b48c60e 100644
--- a/packages/server/healthchecks/postgres.ts
+++ b/packages/server/healthchecks/postgres.ts
@@ -1,5 +1,5 @@
 import type { Knex } from 'knex'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import { getServerConfigFactory } from '@/modules/core/repositories/server'
 import { getAllRegisteredDbClients } from '@/modules/multiregion/utils/dbSelector'
 import type { CheckResponse, MultiDBCheck } from '@/healthchecks/types'
 import { ensureErrorOrWrapAsCause } from '@/modules/shared/errors/ensureError'
@@ -9,10 +9,10 @@ type DBCheck = (params: { db: Knex }) => Promise<CheckResponse>
 
 export const isPostgresAlive: DBCheck = async (params) => {
   const { db } = params
-  const getServerInfo = getServerInfoFactory({ db })
+  const getServerConfig = getServerConfigFactory({ db })
 
   try {
-    await getServerInfo()
+    await getServerConfig({ bustCache: true }) // we always want this to hit the database, so it should not be cached
   } catch (err) {
     return { isAlive: false, err: ensureError(err, 'Unknown Postgres error.') }
   }
diff --git a/packages/server/modules/activitystream/repositories/index.ts b/packages/server/modules/activitystream/repositories/index.ts
index 3f4d8819cc..083d7b5e89 100644
--- a/packages/server/modules/activitystream/repositories/index.ts
+++ b/packages/server/modules/activitystream/repositories/index.ts
@@ -25,7 +25,10 @@ import { dispatchStreamEventFactory } from '@/modules/webhooks/services/webhooks
 import { Knex } from 'knex'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getProjectDbClient } from '@/modules/multiregion/utils/dbSelector'
 
 const tables = {
@@ -259,7 +262,9 @@ export const saveActivityFactory =
       // the whole activity module will need to be refactored to use the eventBus
       await dispatchStreamEventFactory({
         getStreamWebhooks: getStreamWebhooksFactory({ db: projectDb }),
-        getServerInfo: getServerInfoFactory({ db }),
+        getServerInfo: getServerInfoFactory({
+          getServerConfig: getServerConfigFactory({ db })
+        }),
         getStream: getStreamFactory({ db: projectDb }),
         createWebhookEvent: createWebhookEventFactory({ db: projectDb }),
         getUser: getUserFactory({ db })
diff --git a/packages/server/modules/activitystream/tests/activity.spec.js b/packages/server/modules/activitystream/tests/activity.spec.js
index 4d79869ccb..92af797f61 100644
--- a/packages/server/modules/activitystream/tests/activity.spec.js
+++ b/packages/server/modules/activitystream/tests/activity.spec.js
@@ -58,7 +58,10 @@ const {
   storeTokenScopesFactory,
   storeTokenResourceAccessDefinitionsFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { createObjectFactory } = require('@/modules/core/services/objects/management')
 const {
   storeSingleObjectIfNotFoundFactory,
@@ -88,13 +91,17 @@ const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
   getUser: getUserFactory({ db }),
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   deleteOldAndInsertNewVerification: deleteOldAndInsertNewVerificationFactory({ db }),
   renderEmail,
   sendEmail
 })
 const createUser = createUserFactory({
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   findEmail,
   storeUser: storeUserFactory({ db }),
   countAdminUsers: countAdminUsersFactory({ db }),
diff --git a/packages/server/modules/activitystream/tests/activitySummary.spec.ts b/packages/server/modules/activitystream/tests/activitySummary.spec.ts
index e5363d3a37..a18202e1cf 100644
--- a/packages/server/modules/activitystream/tests/activitySummary.spec.ts
+++ b/packages/server/modules/activitystream/tests/activitySummary.spec.ts
@@ -37,13 +37,18 @@ import { buildCoreInviteEmailContentsFactory } from '@/modules/serverinvites/ser
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
 const cleanup = async () => {
   await truncateTables([StreamActivity.name, Users.name])
 }
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/auth/index.ts b/packages/server/modules/auth/index.ts
index 0621b35bd8..61922d9ade 100644
--- a/packages/server/modules/auth/index.ts
+++ b/packages/server/modules/auth/index.ts
@@ -57,7 +57,10 @@ import { requestNewEmailVerificationFactory } from '@/modules/emails/services/ve
 import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repositories'
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { initializeEventListenerFactory } from '@/modules/auth/services/postAuth'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
@@ -65,13 +68,17 @@ const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
   getUser: getUserFactory({ db }),
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   deleteOldAndInsertNewVerification: deleteOldAndInsertNewVerificationFactory({ db }),
   renderEmail,
   sendEmail
 })
 const createUser = createUserFactory({
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   findEmail,
   storeUser: storeUserFactory({ db }),
   countAdminUsers: countAdminUsersFactory({ db }),
@@ -111,7 +118,9 @@ const finalizeInvitedServerRegistration = finalizeInvitedServerRegistrationFacto
 const resolveAuthRedirectPath = resolveAuthRedirectPathFactory()
 
 const commonBuilderDeps = {
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   getUserByEmail: legacyGetUserByEmailFactory({ db }),
   findOrCreateUser,
   validateServerInvite,
diff --git a/packages/server/modules/auth/tests/apps.graphql.spec.js b/packages/server/modules/auth/tests/apps.graphql.spec.js
index 6f651fde0c..0dbe37cc96 100644
--- a/packages/server/modules/auth/tests/apps.graphql.spec.js
+++ b/packages/server/modules/auth/tests/apps.graphql.spec.js
@@ -59,7 +59,10 @@ const {
   storeUserServerAppTokenFactory,
   storePersonalApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 let sendRequest
@@ -83,7 +86,9 @@ const createAppTokenFromAccessCode = createAppTokenFromAccessCodeFactory({
   createBareToken
 })
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/modules/auth/tests/apps.spec.js b/packages/server/modules/auth/tests/apps.spec.js
index 47b583ab61..6925dbad83 100644
--- a/packages/server/modules/auth/tests/apps.spec.js
+++ b/packages/server/modules/auth/tests/apps.spec.js
@@ -73,7 +73,10 @@ const {
   getTokenResourceAccessDefinitionsByIdFactory,
   updateApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 const db = knex
@@ -115,7 +118,9 @@ const refreshAppToken = refreshAppTokenFactory({
   createBareToken
 })
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/modules/auth/tests/auth.spec.js b/packages/server/modules/auth/tests/auth.spec.js
index 45f75cd951..41d9223c04 100644
--- a/packages/server/modules/auth/tests/auth.spec.js
+++ b/packages/server/modules/auth/tests/auth.spec.js
@@ -67,10 +67,13 @@ const {
 } = require('@/modules/serverinvites/services/processing')
 const {
   getServerInfoFactory,
-  updateServerInfoFactory
+  updateServerInfoFactory,
+  getServerConfigFactory
 } = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const createInviteDirectly = createStreamInviteDirectly
diff --git a/packages/server/modules/blobstorage/tests/blobstorage.graph.spec.js b/packages/server/modules/blobstorage/tests/blobstorage.graph.spec.js
index dc5469f9ba..a3ad884595 100644
--- a/packages/server/modules/blobstorage/tests/blobstorage.graph.spec.js
+++ b/packages/server/modules/blobstorage/tests/blobstorage.graph.spec.js
@@ -61,9 +61,14 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/blobstorage/tests/blobstorage.integration.spec.ts b/packages/server/modules/blobstorage/tests/blobstorage.integration.spec.ts
index 578e17188d..b15ed225a0 100644
--- a/packages/server/modules/blobstorage/tests/blobstorage.integration.spec.ts
+++ b/packages/server/modules/blobstorage/tests/blobstorage.integration.spec.ts
@@ -33,7 +33,10 @@ import {
   storeTokenScopesFactory,
   storeTokenResourceAccessDefinitionsFactory
 } from '@/modules/core/repositories/tokens'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { BasicTestStream, createTestStream } from '@/test/speckle-helpers/streamHelper'
 import { waitForRegionUser } from '@/test/speckle-helpers/regions'
 import { createTestWorkspace } from '@/modules/workspaces/tests/helpers/creation'
@@ -43,7 +46,9 @@ import cryptoRandomString from 'crypto-random-string'
 import type { BlobStorageItem } from '@/modules/blobstorage/domain/types'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
diff --git a/packages/server/modules/comments/tests/comments.graph.spec.js b/packages/server/modules/comments/tests/comments.graph.spec.js
index 6c2bc26291..62b59a7197 100644
--- a/packages/server/modules/comments/tests/comments.graph.spec.js
+++ b/packages/server/modules/comments/tests/comments.graph.spec.js
@@ -112,10 +112,15 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { createObjectFactory } = require('@/modules/core/services/objects/management')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const markCommitStreamUpdated = markCommitStreamUpdatedFactory({ db })
diff --git a/packages/server/modules/comments/tests/comments.spec.ts b/packages/server/modules/comments/tests/comments.spec.ts
index aa62f4dfe5..c05b79d4b3 100644
--- a/packages/server/modules/comments/tests/comments.spec.ts
+++ b/packages/server/modules/comments/tests/comments.spec.ts
@@ -109,7 +109,10 @@ import { sendEmail } from '@/modules/emails/services/sending'
 import { createUserFactory } from '@/modules/core/services/users/management'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { createObjectFactory } from '@/modules/core/services/objects/management'
 import type express from 'express'
 import { ResourceType } from '@/modules/comments/domain/types'
@@ -127,7 +130,9 @@ type LegacyCommentRecord = CommentRecord & {
   resources: Array<{ resourceId: string; resourceType: string }>
 }
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/core/cache/cache.ts b/packages/server/modules/core/cache/cache.ts
new file mode 100644
index 0000000000..9409ccb4d5
--- /dev/null
+++ b/packages/server/modules/core/cache/cache.ts
@@ -0,0 +1,14 @@
+import { ServerConfigRecord } from '@/modules/core/helpers/types'
+import TTLCache from '@isaacs/ttlcache'
+
+let serverConfigCache: TTLCache<string, ServerConfigRecord> | undefined
+
+export const getServerConfigCache = () => {
+  if (!serverConfigCache)
+    serverConfigCache = new TTLCache<string, ServerConfigRecord>({
+      max: 1,
+      ttl: 60 * 1000
+    })
+
+  return serverConfigCache
+}
diff --git a/packages/server/modules/core/graph/resolvers/projects.ts b/packages/server/modules/core/graph/resolvers/projects.ts
index d59527dfdd..463f72df37 100644
--- a/packages/server/modules/core/graph/resolvers/projects.ts
+++ b/packages/server/modules/core/graph/resolvers/projects.ts
@@ -42,7 +42,10 @@ import {
   storeProjectFactory,
   storeProjectRoleFactory
 } from '@/modules/core/repositories/projects'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   getStreamFactory,
   getStreamCollaboratorsFactory,
@@ -101,7 +104,9 @@ import {
 } from '@/modules/shared/utils/subscriptions'
 import { has } from 'lodash'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const getUser = getUserFactory({ db })
 const saveActivity = saveActivityFactory({ db })
diff --git a/packages/server/modules/core/graph/resolvers/server.ts b/packages/server/modules/core/graph/resolvers/server.ts
index 7b80e443c6..9cd640eac4 100644
--- a/packages/server/modules/core/graph/resolvers/server.ts
+++ b/packages/server/modules/core/graph/resolvers/server.ts
@@ -10,18 +10,18 @@ import {
   updateServerInfoFactory,
   getPublicRolesFactory,
   getPublicScopesFactory,
-  getServerInfoFromCacheFactory,
-  storeServerInfoInCacheFactory
+  getServerConfigViaCacheFactory
 } from '@/modules/core/repositories/server'
 import { db } from '@/db/knex'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
-import { LRUCache } from 'lru-cache'
-import { ServerInfo } from '@/modules/core/helpers/types'
+import { getServerConfigCache } from '@/modules/core/cache/cache'
 
-const cache = new LRUCache<string, ServerInfo>({ max: 1, ttl: 60 * 1000 })
-const getServerInfoFromCache = getServerInfoFromCacheFactory({ cache })
-const storeServerInfoInCache = storeServerInfoInCacheFactory({ cache })
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigViaCacheFactory({
+    cache: getServerConfigCache(),
+    db
+  })
+})
 const updateServerInfo = updateServerInfoFactory({ db })
 const getPublicRoles = getPublicRolesFactory({ db })
 const getPublicScopes = getPublicScopesFactory({ db })
@@ -29,11 +29,7 @@ const getPublicScopes = getPublicScopesFactory({ db })
 export = {
   Query: {
     async serverInfo() {
-      const cachedServerInfo = getServerInfoFromCache()
-      if (cachedServerInfo) return cachedServerInfo
-      const serverInfo = await getServerInfo()
-      storeServerInfoInCache({ serverInfo })
-      return serverInfo
+      return await getServerInfo()
     }
   },
   ServerInfo: {
@@ -71,7 +67,7 @@ export = {
       await updateServerInfo(update)
       // we're currently going to ignore, that this should be propagated to all
       // backend instances, and going to rely on the TTL in the cache to propagate the changes
-      cache.clear()
+      getServerConfigCache().clear()
       return true
     },
     serverInfoMutations: () => ({})
diff --git a/packages/server/modules/core/graph/resolvers/streams.ts b/packages/server/modules/core/graph/resolvers/streams.ts
index 0e3ab7eb8b..ff5ca0d3a1 100644
--- a/packages/server/modules/core/graph/resolvers/streams.ts
+++ b/packages/server/modules/core/graph/resolvers/streams.ts
@@ -83,10 +83,15 @@ import {
   getFavoriteStreamsCollectionFactory
 } from '@/modules/core/services/streams/favorite'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { adminOverrideEnabled } from '@/modules/shared/helpers/envHelper'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const getUser = getUserFactory({ db })
 const getFavoriteStreamsCollection = getFavoriteStreamsCollectionFactory({
diff --git a/packages/server/modules/core/graph/resolvers/userEmails.ts b/packages/server/modules/core/graph/resolvers/userEmails.ts
index f83de4856d..59d9751843 100644
--- a/packages/server/modules/core/graph/resolvers/userEmails.ts
+++ b/packages/server/modules/core/graph/resolvers/userEmails.ts
@@ -19,13 +19,18 @@ import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repos
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
 import { getUserFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
 const getUser = getUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
   getUser,
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   deleteOldAndInsertNewVerification: deleteOldAndInsertNewVerificationFactory({ db }),
   renderEmail,
   sendEmail
diff --git a/packages/server/modules/core/graph/resolvers/users.ts b/packages/server/modules/core/graph/resolvers/users.ts
index b0ed9b04b2..c17979920f 100644
--- a/packages/server/modules/core/graph/resolvers/users.ts
+++ b/packages/server/modules/core/graph/resolvers/users.ts
@@ -41,7 +41,10 @@ import {
 import { dbLogger } from '@/logging/logging'
 import { getAdminUsersListCollectionFactory } from '@/modules/core/services/users/legacyAdminUsersList'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
 const getUser = legacyGetUserFactory({ db })
 const getUserByEmail = legacyGetUserByEmailFactory({ db })
@@ -54,7 +57,9 @@ const updateUserAndNotify = updateUserAndNotifyFactory({
   })
 })
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const deleteUser = deleteUserFactory({
   deleteStream: deleteStreamFactory({ db }),
   logger: dbLogger,
diff --git a/packages/server/modules/core/repositories/server.ts b/packages/server/modules/core/repositories/server.ts
index 1360adba9b..8ed50f1257 100644
--- a/packages/server/modules/core/repositories/server.ts
+++ b/packages/server/modules/core/repositories/server.ts
@@ -18,7 +18,8 @@ import {
   getServerVersion
 } from '@/modules/shared/helpers/envHelper'
 import { Knex } from 'knex'
-import { LRUCache } from 'lru-cache'
+import { retrieveViaCacheFactory } from '@/modules/core/utils/cacheHandler'
+import { InMemoryCache } from '@/modules/core/utils/cacheHandler'
 
 const ServerConfig = buildTableHelper('server_config', [
   'id',
@@ -41,28 +42,52 @@ const tables = {
 
 const SERVER_CONFIG_CACHE_KEY = 'server_config'
 
-export const getServerInfoFromCacheFactory =
-  ({ cache }: { cache: LRUCache<string, ServerInfo> }) =>
-  () => {
-    const serverInfo = cache.get(SERVER_CONFIG_CACHE_KEY)
-    return serverInfo ?? null
-  }
+export type GetServerConfig = (params?: {
+  bustCache?: boolean
+}) => Promise<ServerConfigRecord>
+
+export const getServerConfigFactory =
+  (deps: { db: Knex }): GetServerConfig =>
+  async () =>
+    // ignore the bustCache parameter, as it will never be cached i.e. defaults to true
+    // An entry should always exist, as one is inserted via db migrations
+    (await tables.serverConfig(deps.db).select('*').first())!
+
+export const getServerConfigViaCacheFactory = (deps: {
+  db: Knex
+  cache: InMemoryCache<ServerConfigRecord>
+}): GetServerConfig => {
+  const { db, cache } = deps
 
-export const storeServerInfoInCacheFactory =
-  ({ cache }: { cache: LRUCache<string, ServerInfo> }) =>
-  ({ serverInfo }: { serverInfo: ServerInfo }) => {
-    cache.set(SERVER_CONFIG_CACHE_KEY, serverInfo)
+  const getFromSourceOrCache = retrieveViaCacheFactory<ServerConfigRecord>({
+    cache,
+    options: {
+      inMemoryTtlSeconds: 60
+    },
+    retrieveFromSource: async () => {
+      // An entry should always exist, as one is inserted via db migrations
+      return getServerConfigFactory({ db })()
+    }
+  })
+  return async (params) => {
+    return await getFromSourceOrCache({
+      key: SERVER_CONFIG_CACHE_KEY,
+      bustCache: params?.bustCache
+    })
   }
+}
 
 export const getServerInfoFactory =
-  (deps: { db: Knex }): GetServerInfo =>
+  (deps: { getServerConfig: GetServerConfig }): GetServerInfo =>
   async () => {
     const movedTo = getServerMovedTo()
     const movedFrom = getServerMovedFrom()
 
+    const serverConfig = await deps.getServerConfig({ bustCache: false })
+
     // An entry should always exist from migrations
     const serverInfo: ServerInfo = {
-      ...(await tables.serverConfig(deps.db).select('*').first())!,
+      ...serverConfig,
       version: getServerVersion(),
       canonicalUrl: getServerOrigin(),
       configuration: {
diff --git a/packages/server/modules/core/tests/branches.spec.ts b/packages/server/modules/core/tests/branches.spec.ts
index a0fc7e2235..8c217b8630 100644
--- a/packages/server/modules/core/tests/branches.spec.ts
+++ b/packages/server/modules/core/tests/branches.spec.ts
@@ -84,7 +84,10 @@ import { sendEmail } from '@/modules/emails/services/sending'
 import { createUserFactory } from '@/modules/core/services/users/management'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getPaginatedStreamBranchesFactory } from '@/modules/core/services/branch/retrieval'
 import { createObjectFactory } from '@/modules/core/services/objects/management'
 import { ensureError } from '@speckle/shared'
@@ -121,7 +124,9 @@ const deleteBranchAndNotify = deleteBranchAndNotifyFactory({
   deleteBranchById: deleteBranchByIdFactory({ db: knex })
 })
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getObject = getObjectFactory({ db: knex })
 const createCommitByBranchId = createCommitByBranchIdFactory({
   createCommit: createCommitFactory({ db }),
diff --git a/packages/server/modules/core/tests/commits.spec.ts b/packages/server/modules/core/tests/commits.spec.ts
index 5d22b2605c..76a6c81e3c 100644
--- a/packages/server/modules/core/tests/commits.spec.ts
+++ b/packages/server/modules/core/tests/commits.spec.ts
@@ -85,7 +85,10 @@ import { sendEmail } from '@/modules/emails/services/sending'
 import { createUserFactory } from '@/modules/core/services/users/management'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   getBranchCommitsTotalCountByNameFactory,
   getPaginatedBranchCommitsItemsByNameFactory
@@ -95,7 +98,9 @@ import { addBranchCreatedActivityFactory } from '@/modules/activitystream/servic
 import { ensureError } from '@speckle/shared'
 import { VersionEvents } from '@/modules/core/domain/commits/events'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const markCommitStreamUpdated = markCommitStreamUpdatedFactory({ db })
diff --git a/packages/server/modules/core/tests/favoriteStreams.spec.js b/packages/server/modules/core/tests/favoriteStreams.spec.js
index f649620425..61eeeebcca 100644
--- a/packages/server/modules/core/tests/favoriteStreams.spec.js
+++ b/packages/server/modules/core/tests/favoriteStreams.spec.js
@@ -67,9 +67,14 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/core/tests/generic.spec.js b/packages/server/modules/core/tests/generic.spec.js
index f54a2d6933..f99461f5cb 100644
--- a/packages/server/modules/core/tests/generic.spec.js
+++ b/packages/server/modules/core/tests/generic.spec.js
@@ -72,9 +72,14 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/core/tests/graph.spec.js b/packages/server/modules/core/tests/graph.spec.js
index cbf61264f3..25ce29e87e 100644
--- a/packages/server/modules/core/tests/graph.spec.js
+++ b/packages/server/modules/core/tests/graph.spec.js
@@ -70,7 +70,10 @@ const {
   storeTokenResourceAccessDefinitionsFactory,
   storePersonalApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 const getUser = getUserFactory({ db })
@@ -105,7 +108,9 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
 })
 const getUsers = legacyGetPaginatedUsersFactory({ db })
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/modules/core/tests/integration/commits.graph.spec.ts b/packages/server/modules/core/tests/integration/commits.graph.spec.ts
index 92c43edf96..b7d9b44731 100644
--- a/packages/server/modules/core/tests/integration/commits.graph.spec.ts
+++ b/packages/server/modules/core/tests/integration/commits.graph.spec.ts
@@ -33,13 +33,18 @@ import {
   storeUserFactory
 } from '@/modules/core/repositories/users'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { WorkspaceReadOnlyError } from '@/modules/gatekeeper/errors/billing'
 import gql from 'graphql-tag'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/core/tests/integration/createUser.spec.ts b/packages/server/modules/core/tests/integration/createUser.spec.ts
index 7b2d7a3746..1172939977 100644
--- a/packages/server/modules/core/tests/integration/createUser.spec.ts
+++ b/packages/server/modules/core/tests/integration/createUser.spec.ts
@@ -32,11 +32,16 @@ import {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } from '@/modules/serverinvites/repositories/serverInvites'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 import { UserEvents } from '@/modules/core/domain/users/events'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
diff --git a/packages/server/modules/core/tests/integration/emailVerification.spec.ts b/packages/server/modules/core/tests/integration/emailVerification.spec.ts
index 108ed2185d..6bd09f1d87 100644
--- a/packages/server/modules/core/tests/integration/emailVerification.spec.ts
+++ b/packages/server/modules/core/tests/integration/emailVerification.spec.ts
@@ -29,10 +29,15 @@ import {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } from '@/modules/serverinvites/repositories/serverInvites'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/modules/core/tests/integration/findUsers.spec.ts b/packages/server/modules/core/tests/integration/findUsers.spec.ts
index 541aa04eb9..c816bb44c8 100644
--- a/packages/server/modules/core/tests/integration/findUsers.spec.ts
+++ b/packages/server/modules/core/tests/integration/findUsers.spec.ts
@@ -33,12 +33,17 @@ import {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } from '@/modules/serverinvites/repositories/serverInvites'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { BasicTestStream, createTestStream } from '@/test/speckle-helpers/streamHelper'
 import { BasicTestUser, createTestUser } from '@/test/authHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
diff --git a/packages/server/modules/core/tests/integration/objects.graph.spec.ts b/packages/server/modules/core/tests/integration/objects.graph.spec.ts
index 6c029bc5a7..5f2f150e36 100644
--- a/packages/server/modules/core/tests/integration/objects.graph.spec.ts
+++ b/packages/server/modules/core/tests/integration/objects.graph.spec.ts
@@ -34,12 +34,17 @@ import {
   storeUserFactory
 } from '@/modules/core/repositories/users'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { WorkspaceReadOnlyError } from '@/modules/gatekeeper/errors/billing'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/core/tests/integration/objects.rest.spec.ts b/packages/server/modules/core/tests/integration/objects.rest.spec.ts
index 1174ca82ae..db265f9526 100644
--- a/packages/server/modules/core/tests/integration/objects.rest.spec.ts
+++ b/packages/server/modules/core/tests/integration/objects.rest.spec.ts
@@ -3,7 +3,10 @@ import {
   createRandomEmail,
   createRandomPassword
 } from '@/modules/core/helpers/testHelpers'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   createUserEmailFactory,
   ensureNoPrimaryEmailForUserFactory,
@@ -43,7 +46,9 @@ import { expect } from 'chai'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/core/tests/integration/updateUser.spec.ts b/packages/server/modules/core/tests/integration/updateUser.spec.ts
index a2e336f5df..8f807b720c 100644
--- a/packages/server/modules/core/tests/integration/updateUser.spec.ts
+++ b/packages/server/modules/core/tests/integration/updateUser.spec.ts
@@ -32,12 +32,17 @@ import {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } from '@/modules/serverinvites/repositories/serverInvites'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
 const userEmailsDB = db(UserEmails.name)
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
diff --git a/packages/server/modules/core/tests/integration/userEmails.graph.spec.ts b/packages/server/modules/core/tests/integration/userEmails.graph.spec.ts
index b46ab1b779..257ecb10da 100644
--- a/packages/server/modules/core/tests/integration/userEmails.graph.spec.ts
+++ b/packages/server/modules/core/tests/integration/userEmails.graph.spec.ts
@@ -35,10 +35,15 @@ import {
   storeUserFactory
 } from '@/modules/core/repositories/users'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/core/tests/integration/userEmails.spec.ts b/packages/server/modules/core/tests/integration/userEmails.spec.ts
index 96dad8cc7d..b7fd02a722 100644
--- a/packages/server/modules/core/tests/integration/userEmails.spec.ts
+++ b/packages/server/modules/core/tests/integration/userEmails.spec.ts
@@ -44,10 +44,15 @@ import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repos
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { sendEmail } from '@/modules/emails/services/sending'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = legacyGetPaginatedUsersFactory({ db })
 const countUsers = legacyGetPaginatedUsersCountFactory({ db })
 
diff --git a/packages/server/modules/core/tests/integration/versions.graph.spec.ts b/packages/server/modules/core/tests/integration/versions.graph.spec.ts
index 7d6100f3e3..bdec7aa3de 100644
--- a/packages/server/modules/core/tests/integration/versions.graph.spec.ts
+++ b/packages/server/modules/core/tests/integration/versions.graph.spec.ts
@@ -34,13 +34,18 @@ import {
   storeUserFactory
 } from '@/modules/core/repositories/users'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { WorkspaceReadOnlyError } from '@/modules/gatekeeper/errors/billing'
 import { CreateVersionInput } from '@/modules/core/graph/generated/graphql'
 import { getFeatureFlags } from '@/modules/shared/helpers/envHelper'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/core/tests/objects.spec.js b/packages/server/modules/core/tests/objects.spec.js
index 9298fbb602..4acc86e956 100644
--- a/packages/server/modules/core/tests/objects.spec.js
+++ b/packages/server/modules/core/tests/objects.spec.js
@@ -63,7 +63,10 @@ const {
 const {
   finalizeInvitedServerRegistrationFactory
 } = require('@/modules/serverinvites/services/processing')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const {
   createObjectFactory,
   createObjectsBatchedFactory,
@@ -103,7 +106,9 @@ const sampleObject = JSON.parse(`{
   "speckleType": "Tests.Polyline"
 }`)
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/core/tests/rest.spec.js b/packages/server/modules/core/tests/rest.spec.js
index 229ca8a495..fcb0835d2b 100644
--- a/packages/server/modules/core/tests/rest.spec.js
+++ b/packages/server/modules/core/tests/rest.spec.js
@@ -72,9 +72,14 @@ const {
   storeTokenResourceAccessDefinitionsFactory,
   storePersonalApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/core/tests/streams.spec.ts b/packages/server/modules/core/tests/streams.spec.ts
index c8179c9d74..b46e3c9662 100644
--- a/packages/server/modules/core/tests/streams.spec.ts
+++ b/packages/server/modules/core/tests/streams.spec.ts
@@ -98,11 +98,16 @@ import {
   updateUserServerRoleFactory
 } from '@/modules/core/repositories/users'
 import { changeUserRoleFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { createObjectFactory } from '@/modules/core/services/objects/management'
 import { addBranchDeletedActivityFactory } from '@/modules/activitystream/services/branchActivity'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const markCommitStreamUpdated = markCommitStreamUpdatedFactory({ db })
diff --git a/packages/server/modules/core/tests/unit/cache.spec.ts b/packages/server/modules/core/tests/unit/cache.spec.ts
new file mode 100644
index 0000000000..01066deb74
--- /dev/null
+++ b/packages/server/modules/core/tests/unit/cache.spec.ts
@@ -0,0 +1,84 @@
+import { describe } from 'mocha'
+import {
+  InMemoryCache,
+  retrieveViaCacheFactory
+} from '@/modules/core/utils/cacheHandler'
+import cryptoRandomString from 'crypto-random-string'
+import { expect } from 'chai'
+
+describe('utils cache @core', () => {
+  describe('bust cache is enabled', () => {
+    it('should return from source and update the cache with new value', async () => {
+      const key = cryptoRandomString({ length: 10 })
+      const mockInMemoryCache: InMemoryCache<string> = {
+        get: () => 'fromInMemory',
+        set: (keyToSet: string, value: string) => {
+          expect(keyToSet).to.equal(key)
+          expect(value).to.equal('fromSource')
+        }
+      }
+      const getViaCache = retrieveViaCacheFactory<string>({
+        cache: mockInMemoryCache,
+        retrieveFromSource: async () => 'fromSource',
+        options: {
+          inMemoryTtlSeconds: 2 // it doesn't matter, as this is an implementation detail for the underlying cache
+        }
+      })
+      const result = await getViaCache({
+        key,
+        bustCache: true
+      })
+      expect(result).to.equal('fromSource')
+    })
+  })
+  describe('bust cache is disabled', () => {
+    describe('key is in the cache', () => {
+      //NB we don't test if the key has expired or not, as this is an implementation detail for the underlying cache
+      it('should return from cache', async () => {
+        const key = cryptoRandomString({ length: 10 })
+        const mockInMemoryCache: InMemoryCache<string> = {
+          get: () => 'fromInMemory',
+          set: () => {
+            expect(true, 'Key should not have been set').to.equal(false)
+          }
+        }
+        const getFromCache = retrieveViaCacheFactory<string>({
+          cache: mockInMemoryCache,
+          retrieveFromSource: async () => 'fromSource',
+          options: {
+            inMemoryTtlSeconds: 2 // it doesn't matter, as this is an implementation detail for the underlying cache
+          }
+        })
+        const result = await getFromCache({
+          key,
+          bustCache: false
+        })
+        expect(result).to.equal('fromInMemory')
+      })
+    })
+    describe('key is not in the cache', () => {
+      it('should return from source and update the cache with new value', async () => {
+        const key = cryptoRandomString({ length: 10 })
+        const mockInMemoryCache: InMemoryCache<string> = {
+          get: () => undefined,
+          set: (keyToSet: string, value: string) => {
+            expect(keyToSet).to.equal(key)
+            expect(value).to.equal('fromSource')
+          }
+        }
+        const getFromCache = retrieveViaCacheFactory<string>({
+          cache: mockInMemoryCache,
+          retrieveFromSource: async () => 'fromSource',
+          options: {
+            inMemoryTtlSeconds: 2 // it doesn't matter, as this is an implementation detail for the underlying cache
+          }
+        })
+        const result = await getFromCache({
+          key,
+          bustCache: false
+        })
+        expect(result).to.equal('fromSource')
+      })
+    })
+  })
+})
diff --git a/packages/server/modules/core/tests/users.spec.ts b/packages/server/modules/core/tests/users.spec.ts
index 2c7893ac4e..9bb893d4a4 100644
--- a/packages/server/modules/core/tests/users.spec.ts
+++ b/packages/server/modules/core/tests/users.spec.ts
@@ -115,12 +115,17 @@ import {
   updateApiTokenFactory
 } from '@/modules/core/repositories/tokens'
 import { getTokenAppInfoFactory } from '@/modules/auth/repositories/apps'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getPaginatedBranchCommitsItemsByNameFactory } from '@/modules/core/services/commit/retrieval'
 import { getPaginatedStreamBranchesFactory } from '@/modules/core/services/branch/retrieval'
 import { createObjectFactory } from '@/modules/core/services/objects/management'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = legacyGetUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const markCommitStreamUpdated = markCommitStreamUpdatedFactory({ db })
diff --git a/packages/server/modules/core/tests/usersAdmin.spec.js b/packages/server/modules/core/tests/usersAdmin.spec.js
index ee038d628f..518dff8747 100644
--- a/packages/server/modules/core/tests/usersAdmin.spec.js
+++ b/packages/server/modules/core/tests/usersAdmin.spec.js
@@ -51,13 +51,18 @@ const {
   getUserDeletableStreamsFactory
 } = require('@/modules/core/repositories/streams')
 const { dbLogger } = require('@/logging/logging')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 const getUsers = legacyGetPaginatedUsersFactory({ db })
 const countUsers = legacyGetPaginatedUsersCountFactory({ db })
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/modules/core/tests/usersAdminList.spec.ts b/packages/server/modules/core/tests/usersAdminList.spec.ts
index 7c87f6a19e..1dfcd4afcb 100644
--- a/packages/server/modules/core/tests/usersAdminList.spec.ts
+++ b/packages/server/modules/core/tests/usersAdminList.spec.ts
@@ -49,12 +49,17 @@ import { deleteOldAndInsertNewVerificationFactory } from '@/modules/emails/repos
 import { createUserFactory } from '@/modules/core/services/users/management'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
 // To ensure that the invites are created in the correct order, we need to wait a bit between each creation
 const WAIT_TIMEOUT = 5
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/core/tests/usersGraphql.spec.ts b/packages/server/modules/core/tests/usersGraphql.spec.ts
index 4d10b4f0b1..5718e236db 100644
--- a/packages/server/modules/core/tests/usersGraphql.spec.ts
+++ b/packages/server/modules/core/tests/usersGraphql.spec.ts
@@ -39,10 +39,15 @@ import {
   storeUserFactory
 } from '@/modules/core/repositories/users'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getEventBus } from '@/modules/shared/services/eventBus'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/core/utils/cacheHandler.ts b/packages/server/modules/core/utils/cacheHandler.ts
new file mode 100644
index 0000000000..b152759eb3
--- /dev/null
+++ b/packages/server/modules/core/utils/cacheHandler.ts
@@ -0,0 +1,39 @@
+export interface InMemoryCache<T> {
+  get: (key: string) => T | undefined
+  set: (key: string, value: T, options: { ttl: number }) => void
+}
+
+export type RetrieveFromCache<T> = (params: {
+  key: string
+  bustCache?: boolean
+}) => Promise<T>
+
+/**
+ * Responsible for handling the retrieval of a value from a cache or, if no cache hit, from the source callback and then caching via an in-memory cache.
+ */
+export const retrieveViaCacheFactory = <T>(deps: {
+  retrieveFromSource: () => Promise<T>
+  cache: InMemoryCache<T>
+  options?: {
+    inMemoryTtlSeconds?: number
+  }
+}): RetrieveFromCache<T> => {
+  const { options, retrieveFromSource, cache } = deps
+  const inMemoryTtl = (options?.inMemoryTtlSeconds || 2) * 1000 // convert seconds to milliseconds
+  return async (params) => {
+    const { key, bustCache } = params
+
+    if (!bustCache) {
+      const cacheResult = cache.get(key)
+      if (cacheResult !== undefined) return cacheResult
+    }
+
+    // if cache is to be busted or if there is no cache hit, we will retrieve from source and then update the cache
+    const result = await retrieveFromSource()
+    cache.set(key, result, {
+      ttl: inMemoryTtl
+    })
+
+    return result
+  }
+}
diff --git a/packages/server/modules/emails/graph/resolvers/index.ts b/packages/server/modules/emails/graph/resolvers/index.ts
index cc31f05fbc..ddcb5fd785 100644
--- a/packages/server/modules/emails/graph/resolvers/index.ts
+++ b/packages/server/modules/emails/graph/resolvers/index.ts
@@ -1,6 +1,9 @@
 import { db } from '@/db/knex'
 import { Resolvers } from '@/modules/core/graph/generated/graphql'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { findPrimaryEmailForUserFactory } from '@/modules/core/repositories/userEmails'
 import {
   getUserByEmailFactory,
@@ -17,7 +20,9 @@ import { requestEmailVerificationFactory } from '@/modules/emails/services/verif
 const getUser = getUserFactory({ db })
 const requestEmailVerification = requestEmailVerificationFactory({
   getUser,
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   deleteOldAndInsertNewVerification: deleteOldAndInsertNewVerificationFactory({ db }),
   findPrimaryEmailForUser: findPrimaryEmailForUserFactory({ db }),
   sendEmail,
diff --git a/packages/server/modules/emails/tests/emailTemplating.spec.ts b/packages/server/modules/emails/tests/emailTemplating.spec.ts
index 075c45d70e..e148a2a216 100644
--- a/packages/server/modules/emails/tests/emailTemplating.spec.ts
+++ b/packages/server/modules/emails/tests/emailTemplating.spec.ts
@@ -1,5 +1,8 @@
 import { db } from '@/db/knex'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { EmailTemplateServerInfo } from '@/modules/emails/domain/operations'
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { expect } from 'chai'
@@ -83,7 +86,9 @@ describe('Basic email template', () => {
   })
 
   it('prefills server info, if not passed in', async () => {
-    const serverInfo = await getServerInfoFactory({ db })()
+    const serverInfo = await getServerInfoFactory({
+      getServerConfig: getServerConfigFactory({ db })
+    })()
 
     const { text, html } = await renderEmail(
       {
diff --git a/packages/server/modules/emails/tests/verifications.spec.ts b/packages/server/modules/emails/tests/verifications.spec.ts
index 6fb9eb028b..2a90124bcb 100644
--- a/packages/server/modules/emails/tests/verifications.spec.ts
+++ b/packages/server/modules/emails/tests/verifications.spec.ts
@@ -28,7 +28,10 @@ import { findPrimaryEmailForUserFactory } from '@/modules/core/repositories/user
 import { sendEmail } from '@/modules/emails/services/sending'
 import { renderEmail } from '@/modules/emails/services/emailRendering'
 import { getUserFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
 const mailerMock = EmailSendingServiceMock
 const getUser = getUserFactory({ db })
@@ -36,7 +39,9 @@ const getPendingToken = getPendingTokenFactory({ db })
 const deleteVerifications = deleteVerificationsFactory({ db })
 const requestEmailVerification = requestEmailVerificationFactory({
   getUser,
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   deleteOldAndInsertNewVerification: deleteOldAndInsertNewVerificationFactory({
     db
   }),
diff --git a/packages/server/modules/fileuploads/tests/fileuploads.integration.spec.ts b/packages/server/modules/fileuploads/tests/fileuploads.integration.spec.ts
index fce77ec0a1..380ab64f9e 100644
--- a/packages/server/modules/fileuploads/tests/fileuploads.integration.spec.ts
+++ b/packages/server/modules/fileuploads/tests/fileuploads.integration.spec.ts
@@ -55,9 +55,14 @@ import {
   storeTokenResourceAccessDefinitionsFactory,
   storeTokenScopesFactory
 } from '@/modules/core/repositories/tokens'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/gatekeeper/index.ts b/packages/server/modules/gatekeeper/index.ts
index 49e2298d02..0458f9dfd6 100644
--- a/packages/server/modules/gatekeeper/index.ts
+++ b/packages/server/modules/gatekeeper/index.ts
@@ -34,7 +34,10 @@ import { reconcileWorkspaceSubscriptionFactory } from '@/modules/gatekeeper/clie
 import { ScheduleExecution } from '@/modules/core/domain/scheduledTasks/operations'
 import { EventBusEmit, getEventBus } from '@/modules/shared/services/eventBus'
 import { sendWorkspaceTrialExpiresEmailFactory } from '@/modules/gatekeeper/services/trialEmails'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { findEmailsByUserIdFactory } from '@/modules/core/repositories/userEmails'
 import { sendEmail } from '@/modules/emails/services/sending'
 import { renderEmail } from '@/modules/emails/services/emailRendering'
@@ -87,7 +90,9 @@ const scheduleWorkspaceTrialEmails = ({
   scheduleExecution: ScheduleExecution
 }) => {
   const sendWorkspaceTrialEmail = sendWorkspaceTrialExpiresEmailFactory({
-    getServerInfo: getServerInfoFactory({ db }),
+    getServerInfo: getServerInfoFactory({
+      getServerConfig: getServerConfigFactory({ db })
+    }),
     getUserEmails: findEmailsByUserIdFactory({ db }),
     getWorkspaceCollaborators: getWorkspaceCollaboratorsFactory({ db }),
     sendEmail,
diff --git a/packages/server/modules/notifications/services/handlers/activityDigest.ts b/packages/server/modules/notifications/services/handlers/activityDigest.ts
index aed78b41b5..5d6875d9db 100644
--- a/packages/server/modules/notifications/services/handlers/activityDigest.ts
+++ b/packages/server/modules/notifications/services/handlers/activityDigest.ts
@@ -29,7 +29,10 @@ import { getActivityFactory } from '@/modules/activitystream/repositories'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import { GetServerInfo } from '@/modules/core/domain/server/operations'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { EmailBody, EmailInput } from '@/modules/emails/domain/operations'
 
 const digestNotificationEmailHandlerFactory =
@@ -439,7 +442,9 @@ const digestNotificationEmailHandler = digestNotificationEmailHandlerFactory({
     getActivity: getActivityFactory({ db }),
     getUser: getUserFactory({ db })
   }),
-  getServerInfo: getServerInfoFactory({ db }),
+  getServerInfo: getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  }),
   renderEmail
 })
 
diff --git a/packages/server/modules/notifications/services/handlers/mentionedInComment.ts b/packages/server/modules/notifications/services/handlers/mentionedInComment.ts
index ca411c45ac..d705435979 100644
--- a/packages/server/modules/notifications/services/handlers/mentionedInComment.ts
+++ b/packages/server/modules/notifications/services/handlers/mentionedInComment.ts
@@ -9,7 +9,10 @@ import { GetUser } from '@/modules/core/domain/users/operations'
 import { Roles } from '@/modules/core/helpers/mainConstants'
 import { getCommentRoute } from '@/modules/core/helpers/routeHelper'
 import { ServerInfo } from '@/modules/core/helpers/types'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory, UserWithOptionalRole } from '@/modules/core/repositories/users'
 import { EmailTemplateParams } from '@/modules/emails/domain/operations'
@@ -228,7 +231,9 @@ const handler: NotificationHandler<MentionedInCommentMessage> = async (...args)
     getUser: getUserFactory({ db }),
     getStream: getStreamFactory({ db }),
     getCommentResolver: ({ projectDb }) => getCommentFactory({ db: projectDb }),
-    getServerInfo: getServerInfoFactory({ db }),
+    getServerInfo: getServerInfoFactory({
+      getServerConfig: getServerConfigFactory({ db })
+    }),
     renderEmail,
     sendEmail
   })
diff --git a/packages/server/modules/notifications/services/handlers/newStreamAccessRequest.ts b/packages/server/modules/notifications/services/handlers/newStreamAccessRequest.ts
index d2d5751f5d..274f751f32 100644
--- a/packages/server/modules/notifications/services/handlers/newStreamAccessRequest.ts
+++ b/packages/server/modules/notifications/services/handlers/newStreamAccessRequest.ts
@@ -21,7 +21,10 @@ import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { GetUser } from '@/modules/core/domain/users/operations'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import { GetServerInfo } from '@/modules/core/domain/server/operations'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { EmailTemplateParams } from '@/modules/emails/domain/operations'
 
 type ValidateMessageDeps = {
@@ -147,7 +150,9 @@ const newStreamAccessRequestHandlerFactory =
 
 const handler: NotificationHandler<NewStreamAccessRequestMessage> = (...args) => {
   const newStreamAccessRequestHandler = newStreamAccessRequestHandlerFactory({
-    getServerInfo: getServerInfoFactory({ db }),
+    getServerInfo: getServerInfoFactory({
+      getServerConfig: getServerConfigFactory({ db })
+    }),
     renderEmail,
     sendEmail,
     getUser: getUserFactory({ db }),
diff --git a/packages/server/modules/notifications/services/handlers/streamAccessRequestApproved.ts b/packages/server/modules/notifications/services/handlers/streamAccessRequestApproved.ts
index 28e7e803be..12f9faa265 100644
--- a/packages/server/modules/notifications/services/handlers/streamAccessRequestApproved.ts
+++ b/packages/server/modules/notifications/services/handlers/streamAccessRequestApproved.ts
@@ -6,7 +6,10 @@ import {
   buildAbsoluteFrontendUrlFromPath,
   getStreamRoute
 } from '@/modules/core/helpers/routeHelper'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
 import { EmailTemplateParams } from '@/modules/emails/domain/operations'
@@ -127,7 +130,9 @@ const handler: NotificationHandler<StreamAccessRequestApprovedMessage> = async (
   ...args
 ) => {
   const streamAccessRequestApprovedHandler = streamAccessRequestApprovedHandlerFactory({
-    getServerInfo: getServerInfoFactory({ db }),
+    getServerInfo: getServerInfoFactory({
+      getServerConfig: getServerConfigFactory({ db })
+    }),
     renderEmail,
     sendEmail,
     getUser: getUserFactory({ db }),
diff --git a/packages/server/modules/pwdreset/rest/index.ts b/packages/server/modules/pwdreset/rest/index.ts
index dd37706d85..93a57fe733 100644
--- a/packages/server/modules/pwdreset/rest/index.ts
+++ b/packages/server/modules/pwdreset/rest/index.ts
@@ -1,6 +1,9 @@
 import { db } from '@/db/knex'
 import { deleteExistingAuthTokensFactory } from '@/modules/auth/repositories'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   getUserByEmailFactory,
   getUserFactory,
@@ -29,7 +32,9 @@ export default function (app: Express) {
         getUserByEmail,
         getPendingToken: getPendingTokenFactory({ db }),
         createToken: createTokenFactory({ db }),
-        getServerInfo: getServerInfoFactory({ db }),
+        getServerInfo: getServerInfoFactory({
+          getServerConfig: getServerConfigFactory({ db })
+        }),
         renderEmail,
         sendEmail
       })
diff --git a/packages/server/modules/pwdreset/tests/pwdrest.spec.js b/packages/server/modules/pwdreset/tests/pwdrest.spec.js
index 9fab02602f..bf2b8bad8d 100644
--- a/packages/server/modules/pwdreset/tests/pwdrest.spec.js
+++ b/packages/server/modules/pwdreset/tests/pwdrest.spec.js
@@ -37,11 +37,16 @@ const {
   deleteServerOnlyInvitesFactory,
   updateAllInviteTargetsFactory
 } = require('@/modules/serverinvites/repositories/serverInvites')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 
 const db = knex
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
index b34f2847f1..76f6cda54c 100644
--- a/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
+++ b/packages/server/modules/serverinvites/graph/resolvers/serverInvites.ts
@@ -82,7 +82,10 @@ import {
   validateStreamAccessFactory
 } from '@/modules/core/services/streams/access'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
 const saveActivity = saveActivityFactory({ db })
 const validateStreamAccess = validateStreamAccessFactory({ authorizeResolver })
@@ -102,7 +105,9 @@ const addOrUpdateStreamCollaborator = addOrUpdateStreamCollaboratorFactory({
     publish
   })
 })
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getStream = getStreamFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail: findEmailFactory({ db }),
diff --git a/packages/server/modules/stats/tests/stats.spec.ts b/packages/server/modules/stats/tests/stats.spec.ts
index f0fd0c17b6..154fca28a6 100644
--- a/packages/server/modules/stats/tests/stats.spec.ts
+++ b/packages/server/modules/stats/tests/stats.spec.ts
@@ -79,10 +79,15 @@ import {
   storeTokenResourceAccessDefinitionsFactory,
   storeTokenScopesFactory
 } from '@/modules/core/repositories/tokens'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { createObjectsFactory } from '@/modules/core/services/objects/management'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const markCommitStreamUpdated = markCommitStreamUpdatedFactory({ db })
 const getObject = getObjectFactory({ db })
diff --git a/packages/server/modules/webhooks/tests/cleanup.spec.ts b/packages/server/modules/webhooks/tests/cleanup.spec.ts
index 9598d19723..57cbb552e7 100644
--- a/packages/server/modules/webhooks/tests/cleanup.spec.ts
+++ b/packages/server/modules/webhooks/tests/cleanup.spec.ts
@@ -4,7 +4,10 @@ import {
   createRandomPassword
 } from '@/modules/core/helpers/testHelpers'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   createStreamFactory,
   getStreamFactory
@@ -55,7 +58,9 @@ const WebhooksConfig = () => knex(WEBHOOKS_CONFIG_TABLE)
 const randomId = () => crs({ length: 10 })
 
 const cleanOrphanedWebhookConfigs = cleanOrphanedWebhookConfigsFactory({ db })
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const getUser = getUserFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/webhooks/tests/webhooks.spec.js b/packages/server/modules/webhooks/tests/webhooks.spec.js
index 0c8001a165..27c556a53b 100644
--- a/packages/server/modules/webhooks/tests/webhooks.spec.js
+++ b/packages/server/modules/webhooks/tests/webhooks.spec.js
@@ -90,9 +90,14 @@ const {
   storeTokenResourceAccessDefinitionsFactory,
   storePersonalApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
index b392a16c97..45247f1b59 100644
--- a/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
+++ b/packages/server/modules/workspaces/graph/resolvers/workspaces.ts
@@ -159,7 +159,10 @@ import {
 } from '@/modules/shared/utils/subscriptions'
 import { updateStreamRoleAndNotifyFactory } from '@/modules/core/services/streams/management'
 import { getUserFactory, getUsersFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { commandFactory } from '@/modules/shared/command'
 import { withTransaction } from '@/modules/shared/helpers/dbHelper'
 import {
@@ -214,7 +217,9 @@ import {
 } from '@/modules/workspaces/repositories/workspaceJoinRequests'
 
 const eventBus = getEventBus()
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getUsers = getUsersFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/modules/workspaces/rest/sso.ts b/packages/server/modules/workspaces/rest/sso.ts
index 01525032cb..997732ea99 100644
--- a/packages/server/modules/workspaces/rest/sso.ts
+++ b/packages/server/modules/workspaces/rest/sso.ts
@@ -71,7 +71,10 @@ import {
   updateAllInviteTargetsFactory
 } from '@/modules/serverinvites/repositories/serverInvites'
 import { createUserFactory } from '@/modules/core/services/users/management'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import { validateAndCreateUserEmailFactory } from '@/modules/core/services/userEmails'
 import { finalizeInvitedServerRegistrationFactory } from '@/modules/serverinvites/services/processing'
 import { requestNewEmailVerificationFactory } from '@/modules/emails/services/verification/request'
@@ -287,7 +290,9 @@ export const getSsoRouter = (): Router => {
         }),
         createWorkspaceUserFromSsoProfile: createWorkspaceUserFromSsoProfileFactory({
           createUser: createUserFactory({
-            getServerInfo: getServerInfoFactory({ db: trx }),
+            getServerInfo: getServerInfoFactory({
+              getServerConfig: getServerConfigFactory({ db: trx })
+            }),
             findEmail: findEmailFactory({ db: trx }),
             storeUser: storeUserFactory({ db: trx }),
             countAdminUsers: countAdminUsersFactory({ db: trx }),
@@ -305,7 +310,9 @@ export const getSsoRouter = (): Router => {
               requestNewEmailVerification: requestNewEmailVerificationFactory({
                 findEmail: findEmailFactory({ db: trx }),
                 getUser: getUserFactory({ db: trx }),
-                getServerInfo: getServerInfoFactory({ db: trx }),
+                getServerInfo: getServerInfoFactory({
+                  getServerConfig: getServerConfigFactory({ db: trx })
+                }),
                 deleteOldAndInsertNewVerification:
                   deleteOldAndInsertNewVerificationFactory({ db: trx }),
                 renderEmail,
diff --git a/packages/server/modules/workspaces/tests/helpers/creation.ts b/packages/server/modules/workspaces/tests/helpers/creation.ts
index bb35888bdc..37b943cc8f 100644
--- a/packages/server/modules/workspaces/tests/helpers/creation.ts
+++ b/packages/server/modules/workspaces/tests/helpers/creation.ts
@@ -46,7 +46,10 @@ import {
 } from '@speckle/shared'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   associateSsoProviderWithWorkspaceFactory,
   getWorkspaceSsoProviderRecordFactory,
@@ -312,7 +315,9 @@ export const createWorkspaceInviteDirectly = async (
   args: CreateWorkspaceInviteMutationVariables,
   inviterId: string
 ) => {
-  const getServerInfo = getServerInfoFactory({ db })
+  const getServerInfo = getServerInfoFactory({
+    getServerConfig: getServerConfigFactory({ db })
+  })
   const getStream = getStreamFactory({ db })
   const getUser = getUserFactory({ db })
   const createAndSendInvite = createAndSendInviteFactory({
diff --git a/packages/server/package.json b/packages/server/package.json
index 664730862f..6746f65609 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -48,6 +48,7 @@
     "@godaddy/terminus": "^4.9.0",
     "@graphql-tools/mock": "^9.0.4",
     "@graphql-tools/schema": "^10.0.6",
+    "@isaacs/ttlcache": "^1.4.1",
     "@lifeomic/attempt": "^3.1.0",
     "@mailchimp/mailchimp_marketing": "^3.0.80",
     "@opentelemetry/api": "^1.9.0",
diff --git a/packages/server/scripts/seedUsers.js b/packages/server/scripts/seedUsers.js
index 610c8b439b..d12398d80e 100644
--- a/packages/server/scripts/seedUsers.js
+++ b/packages/server/scripts/seedUsers.js
@@ -1,7 +1,10 @@
 require('../bootstrap')
 const { db } = require('@/db/knex')
 const { logger } = require('@/logging/logging')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 const {
   findEmailFactory,
   createUserEmailFactory,
@@ -35,7 +38,9 @@ const {
 const { getEventBus } = require('@/modules/shared/services/eventBus')
 const axios = require('axios').default
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/scripts/streamObjects.js b/packages/server/scripts/streamObjects.js
index 544ed287e6..4af299505a 100644
--- a/packages/server/scripts/streamObjects.js
+++ b/packages/server/scripts/streamObjects.js
@@ -45,9 +45,14 @@ const {
   storeTokenResourceAccessDefinitionsFactory,
   storePersonalApiTokenFactory
 } = require('@/modules/core/repositories/tokens')
-const { getServerInfoFactory } = require('@/modules/core/repositories/server')
+const {
+  getServerInfoFactory,
+  getServerConfigFactory
+} = require('@/modules/core/repositories/server')
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const getUser = getUserFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/packages/server/test/authHelper.ts b/packages/server/test/authHelper.ts
index 72db85041b..a8e09c60e4 100644
--- a/packages/server/test/authHelper.ts
+++ b/packages/server/test/authHelper.ts
@@ -1,7 +1,10 @@
 import { db } from '@/db/knex'
 import { AllScopes, ServerRoles } from '@/modules/core/helpers/mainConstants'
 import { UserRecord } from '@/modules/core/helpers/types'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   storeApiTokenFactory,
   storePersonalApiTokenFactory,
@@ -36,7 +39,9 @@ import { faker } from '@faker-js/faker'
 import { ServerScope, wait } from '@speckle/shared'
 import { isArray, isNumber, kebabCase, omit, times } from 'lodash'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const findEmail = findEmailFactory({ db })
 const requestNewEmailVerification = requestNewEmailVerificationFactory({
   findEmail,
diff --git a/packages/server/test/speckle-helpers/inviteHelper.ts b/packages/server/test/speckle-helpers/inviteHelper.ts
index f618daf498..982023bbdb 100644
--- a/packages/server/test/speckle-helpers/inviteHelper.ts
+++ b/packages/server/test/speckle-helpers/inviteHelper.ts
@@ -27,9 +27,14 @@ import {
 import { EmailSendingServiceMock } from '@/test/mocks/global'
 import { getStreamFactory } from '@/modules/core/repositories/streams'
 import { getUserFactory } from '@/modules/core/repositories/users'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUser = getUserFactory({ db })
 const getStream = getStreamFactory({ db })
 const createAndSendInvite = createAndSendInviteFactory({
diff --git a/packages/server/test/speckle-helpers/streamHelper.ts b/packages/server/test/speckle-helpers/streamHelper.ts
index 6414e35cad..c5adbb5918 100644
--- a/packages/server/test/speckle-helpers/streamHelper.ts
+++ b/packages/server/test/speckle-helpers/streamHelper.ts
@@ -8,7 +8,10 @@ import {
 import { StreamAcl } from '@/modules/core/dbSchema'
 import { StreamAclRecord, StreamRecord } from '@/modules/core/helpers/types'
 import { createBranchFactory } from '@/modules/core/repositories/branches'
-import { getServerInfoFactory } from '@/modules/core/repositories/server'
+import {
+  getServerConfigFactory,
+  getServerInfoFactory
+} from '@/modules/core/repositories/server'
 import {
   createStreamFactory,
   getStreamCollaboratorsFactory,
@@ -47,7 +50,9 @@ import { faker } from '@faker-js/faker'
 import { ensureError, Roles, StreamRoles } from '@speckle/shared'
 import { omit } from 'lodash'
 
-const getServerInfo = getServerInfoFactory({ db })
+const getServerInfo = getServerInfoFactory({
+  getServerConfig: getServerConfigFactory({ db })
+})
 const getUsers = getUsersFactory({ db })
 const getUser = getUserFactory({ db })
 const getStream = getStreamFactory({ db })
diff --git a/yarn.lock b/yarn.lock
index 092d9050d4..545b7cb1ac 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12103,6 +12103,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@isaacs/ttlcache@npm:^1.4.1":
+  version: 1.4.1
+  resolution: "@isaacs/ttlcache@npm:1.4.1"
+  checksum: 10/57f2b00b58845d48a173c7668c58c27c3e6f91a56c17d6d4c58b38780a475a858ce3b4fc2cd4304469eee9f49818b79a187f0e13120b3617c4f67e4abc475698
+  languageName: node
+  linkType: hard
+
 "@istanbuljs/load-nyc-config@npm:^1.0.0":
   version: 1.1.0
   resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
@@ -17229,6 +17236,7 @@ __metadata:
     "@graphql-codegen/typescript-resolvers": "npm:^4.4.0"
     "@graphql-tools/mock": "npm:^9.0.4"
     "@graphql-tools/schema": "npm:^10.0.6"
+    "@isaacs/ttlcache": "npm:^1.4.1"
     "@lifeomic/attempt": "npm:^3.1.0"
     "@mailchimp/mailchimp_marketing": "npm:^3.0.80"
     "@opentelemetry/api": "npm:^1.9.0"