diff --git a/CommonServer/Services/TelemetryUsageBillingService.ts b/CommonServer/Services/TelemetryUsageBillingService.ts
index 66742a50dc..2d31a6eb6d 100644
--- a/CommonServer/Services/TelemetryUsageBillingService.ts
+++ b/CommonServer/Services/TelemetryUsageBillingService.ts
@@ -102,6 +102,18 @@ export class Service extends DatabaseService<Model> {
         });
 
         if (usageBilling && usageBilling.id) {
+            let totalCostInUSD: number =
+                usageBilling.totalCostInUSD?.value || 0;
+
+            if (
+                isNaN(totalCostInUSD) ||
+                totalCostInUSD === undefined ||
+                totalCostInUSD === null ||
+                (typeof totalCostInUSD === 'string' && totalCostInUSD === 'NaN')
+            ) {
+                totalCostInUSD = 0;
+            }
+
             await this.updateOneById({
                 id: usageBilling.id,
                 data: {
@@ -110,9 +122,9 @@ export class Service extends DatabaseService<Model> {
                             data.dataIngestedInGB
                     ),
                     totalCostInUSD: new Decimal(
-                        (usageBilling.totalCostInUSD?.value || 0) +
-                            totalCostOfThisOperationInUSD
+                        totalCostInUSD + totalCostOfThisOperationInUSD
                     ),
+                    retainTelemetryDataForDays: data.retentionInDays,
                 },
                 props: {
                     isRoot: true,
diff --git a/Ingestor/Middleware/TelemetryIngest.ts b/Ingestor/Middleware/TelemetryIngest.ts
index 32c9c6c9bb..43092d3acc 100644
--- a/Ingestor/Middleware/TelemetryIngest.ts
+++ b/Ingestor/Middleware/TelemetryIngest.ts
@@ -5,7 +5,6 @@ import {
 } from 'CommonServer/Utils/Express';
 import { ProbeExpressRequest } from '../Types/Request';
 import BadRequestException from 'Common/Types/Exception/BadRequestException';
-import GlobalCache from 'CommonServer/Infrastructure/GlobalCache';
 import DiskSize from 'Common/Types/DiskSize';
 import ObjectID from 'Common/Types/ObjectID';
 import TelemetryUsageBillingService from 'CommonServer/Services/TelemetryUsageBillingService';
@@ -48,64 +47,35 @@ export default class TelemetryIngest {
 
             const sizeToGb: number = DiskSize.byteSizeToGB(sizeInBytes);
 
-            const cachedServiceId: string | null = await GlobalCache.getString(
-                'service-token',
-                serviceTokenInHeader as string
-            );
+            // load from the database and set the cache.
+            const service: TelemetryService | null =
+                await TelemetryServiceService.findOneBy({
+                    query: {
+                        telemetryServiceToken: new ObjectID(
+                            serviceTokenInHeader as string
+                        ),
+                    },
+                    select: {
+                        _id: true,
+                        projectId: true,
+                        retainTelemetryDataForDays: true,
+                    },
+                    props: {
+                        isRoot: true,
+                    },
+                });
 
-            const serviceProjectId: string | null = await GlobalCache.getString(
-                'service-project-id',
-                serviceTokenInHeader as string
-            );
-
-            if (!cachedServiceId || !serviceProjectId) {
-                // load from the database and set the cache.
-                const service: TelemetryService | null =
-                    await TelemetryServiceService.findOneBy({
-                        query: {
-                            telemetryServiceToken: new ObjectID(
-                                serviceTokenInHeader as string
-                            ),
-                        },
-                        select: {
-                            _id: true,
-                            projectId: true,
-                            retainTelemetryDataForDays: true,
-                        },
-                        props: {
-                            isRoot: true,
-                        },
-                    });
-
-                if (!service) {
-                    throw new BadRequestException('Invalid service token');
-                }
-
-                await GlobalCache.setString(
-                    'service-token',
-                    serviceTokenInHeader as string,
-                    service._id?.toString() as string
-                );
-                await GlobalCache.setString(
-                    'service-project-id',
-                    serviceTokenInHeader as string,
-                    service.projectId?.toString() as string
-                );
-
-                (req as TelemetryRequest).serviceId = service.id as ObjectID;
-                (req as TelemetryRequest).projectId =
-                    service.projectId as ObjectID;
-                (req as TelemetryRequest).dataRententionInDays =
-                    service.retainTelemetryDataForDays ||
-                    DEFAULT_RETENTION_IN_DAYS;
+            if (!service) {
+                throw new BadRequestException('Invalid service token');
             }
 
-            (req as TelemetryRequest).serviceId = ObjectID.fromString(
-                cachedServiceId as string
-            );
-            (req as TelemetryRequest).projectId = ObjectID.fromString(
-                serviceProjectId as string
-            );
+            (req as TelemetryRequest).serviceId = service.id as ObjectID;
+            (req as TelemetryRequest).projectId = service.projectId as ObjectID;
+            (req as TelemetryRequest).dataRententionInDays =
+                service.retainTelemetryDataForDays || DEFAULT_RETENTION_IN_DAYS;
+
+            (req as TelemetryRequest).serviceId = service.id as ObjectID;
+            (req as TelemetryRequest).projectId = service.projectId as ObjectID;
 
             // report to Usage Service.
             TelemetryUsageBillingService.updateUsageBilling({