diff --git a/src/services/api/routes/v1/login.js b/src/services/api/routes/v1/login.js
index 29148fb..e791c5a 100644
--- a/src/services/api/routes/v1/login.js
+++ b/src/services/api/routes/v1/login.js
@@ -91,13 +91,13 @@ router.post('/', async (request, response) => {
 		});
 	}
 
-	let publicKey = cache.getServicePublicKey('account');
+	let publicKey= await cache.getServicePublicKey('account');
 	if (publicKey === null) {
 		publicKey = await fs.readFile(`${cryptoPath}/public.pem`);
 		await cache.setServicePublicKey('account', publicKey);
 	}
 
-	let secretKey = cache.getServiceSecretKey('account');
+	let secretKey= await cache.getServiceSecretKey('account');
 	if (secretKey === null) {
 		secretKey = await fs.readFile(`${cryptoPath}/secret.key`);
 		await cache.setServiceSecretKey('account', secretKey);
diff --git a/src/services/api/routes/v1/register.js b/src/services/api/routes/v1/register.js
index 3998194..bfc3e05 100644
--- a/src/services/api/routes/v1/register.js
+++ b/src/services/api/routes/v1/register.js
@@ -311,13 +311,13 @@ router.post('/', async (request, response) => {
 		});
 	}
 
-	let publicKey = cache.getServicePublicKey('account');
+	let publicKey= await cache.getServicePublicKey('account');
 	if (publicKey === null) {
 		publicKey = await fs.readFile(`${cryptoPath}/public.pem`);
 		await cache.setServicePublicKey('account', publicKey);
 	}
 
-	let secretKey = cache.getServiceSecretKey('account');
+	let secretKey= await cache.getServiceSecretKey('account');
 	if (secretKey === null) {
 		secretKey = await fs.readFile(`${cryptoPath}/secret.key`);
 		await cache.setServiceSecretKey('account', secretKey);
diff --git a/src/services/nasc/routes/ac.js b/src/services/nasc/routes/ac.js
index b34c0b1..d6eaa26 100644
--- a/src/services/nasc/routes/ac.js
+++ b/src/services/nasc/routes/ac.js
@@ -55,13 +55,13 @@ async function processLoginRequest(request) {
 
 	const cryptoPath = `${__dirname}/../../../../certs/nex/${service_name}`;
 
-	let publicKey = cache.getNEXPublicKey(service_name);
+	let publicKey= await cache.getNEXPublicKey(service_name);
 	if (publicKey === null) {
 		publicKey = await fs.readFile(`${cryptoPath}/public.pem`);
 		await cache.setNEXPublicKey(service_name, publicKey);
 	}
 
-	let secretKey = cache.getNEXSecretKey(service_name);
+	let secretKey= await cache.getNEXSecretKey(service_name);
 	if (secretKey === null) {
 		secretKey = await fs.readFile(`${cryptoPath}/secret.key`);
 		await cache.setNEXSecretKey(service_name, secretKey);
diff --git a/src/services/nnid/routes/provider.js b/src/services/nnid/routes/provider.js
index da710d3..c60c2b8 100644
--- a/src/services/nnid/routes/provider.js
+++ b/src/services/nnid/routes/provider.js
@@ -44,13 +44,13 @@ router.get('/service_token/@me', async (request, response) => {
 		}).end());
 	}
 
-	let publicKey = cache.getServicePublicKey(service_name);
+	let publicKey= await cache.getServicePublicKey(service_name);
 	if (publicKey === null) {
 		publicKey = await fs.readFile(`${cryptoPath}/public.pem`);
 		await cache.setServicePublicKey(service_name, publicKey);
 	}
 
-	let secretKey = cache.getServiceSecretKey(service_name);
+	let secretKey= await cache.getServiceSecretKey(service_name);
 	if (secretKey === null) {
 		secretKey = await fs.readFile(`${cryptoPath}/secret.key`);
 		await cache.setServiceSecretKey(service_name, secretKey);
@@ -134,13 +134,13 @@ router.get('/nex_token/@me', async (request, response) => {
 		}).end());
 	}
 
-	let publicKey = cache.getNEXPublicKey(service_name);
+	let publicKey= await cache.getNEXPublicKey(service_name);
 	if (publicKey === null) {
 		publicKey = await fs.readFile(`${cryptoPath}/public.pem`);
 		await cache.setNEXPublicKey(service_name, publicKey);
 	}
 
-	let secretKey = cache.getNEXSecretKey(service_name);
+	let secretKey= await cache.getNEXSecretKey(service_name);
 	if (secretKey === null) {
 		secretKey = await fs.readFile(`${cryptoPath}/secret.key`);
 		await cache.setNEXSecretKey(service_name, secretKey);
diff --git a/src/util.js b/src/util.js
index 26082e7..1ef6a2c 100644
--- a/src/util.js
+++ b/src/util.js
@@ -41,7 +41,7 @@ async function generateToken(cryptoOptions, tokenOptions) {
 	// Access and refresh tokens use a different format since they must be much smaller
 	// They take no extra crypto options
 	if (!cryptoOptions) {
-		let aesKey = cache.getServiceAESKey('account', 'hex');
+		let aesKey = await cache.getServiceAESKey('account', 'hex');
 
 		if (aesKey === null) {
 			const fileBuffer = await fs.readFile(`${__dirname}/../certs/access/aes.key`, { encoding: 'utf8' });
@@ -135,7 +135,7 @@ async function decryptToken(token) {
 	// Access and refresh tokens use a different format since they must be much smaller
 	// Assume a small length means access or refresh token
 	if (token.length <= 32) {
-		let aesKey = cache.getServiceAESKey('account', 'hex');
+		let aesKey = await cache.getServiceAESKey('account', 'hex');
 
 		if (aesKey === null) {
 			const fileBuffer = await fs.readFile(`${cryptoPath}/aes.key`, { encoding: 'utf8' });
@@ -153,13 +153,13 @@ async function decryptToken(token) {
 		return decryptedBody;
 	}
 
-	let privateKeyBytes = cache.getServicePrivateKey('account');
+	let privateKeyBytes = await cache.getServicePrivateKey('account');
 	if (privateKeyBytes === null) {
 		privateKeyBytes = await fs.readFile(`${cryptoPath}/private.pem`);
 		await cache.setServicePrivateKey('account', privateKeyBytes);
 	}
 
-	let secretKey = cache.getServiceSecretKey('account');
+	let secretKey = await cache.getServiceSecretKey('account');
 	if (secretKey === null) {
 		secretKey = await fs.readFile(`${cryptoPath}/secret.key`);
 		await cache.setServiceSecretKey('account', secretKey);