diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs
index 6e8b3e89..713f5614 100644
--- a/AsbCloudInfrastructure/DependencyInjection.cs
+++ b/AsbCloudInfrastructure/DependencyInjection.cs
@@ -52,6 +52,11 @@ namespace AsbCloudInfrastructure
     {
         public static void MapsterSetup()
         {
+            TypeAdapterConfig.GlobalSettings.Default.Config
+               .ForType<SetpointsRequestDto, SetpointsRequest>()
+               .Ignore(source => source.Author)
+               .Ignore(source => source.Well);
+               
             TypeAdapterConfig.GlobalSettings.Default.Config
                .ForType<DetectedOperationDto, DetectedOperation>()
                .Ignore(source => source.OperationCategory);
diff --git a/AsbCloudInfrastructure/Repository/CacheBase.cs b/AsbCloudInfrastructure/Repository/CacheBase.cs
index 28d07f07..84f702df 100644
--- a/AsbCloudInfrastructure/Repository/CacheBase.cs
+++ b/AsbCloudInfrastructure/Repository/CacheBase.cs
@@ -53,7 +53,7 @@ namespace AsbCloudInfrastructure.Repository
                 cacheEntry.AbsoluteExpirationRelativeToNow = CacheObsolescence;
                 cacheEntry.SlidingExpiration = CacheObsolescence;
 
-                var entities = await this.GetQuery().ToArrayAsync(token);
+                var entities = await GetQuery().AsNoTracking().ToArrayAsync(token);
                 cacheEntry.Value = entities;
                 return entities.AsEnumerable();
             });
diff --git a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
index 2c1f7905..c2b359db 100644
--- a/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
+++ b/AsbCloudInfrastructure/Repository/SetpointsRequestRepository.cs
@@ -40,9 +40,14 @@ namespace AsbCloudInfrastructure.Repository
             {
                 var entity = Convert(dto);
                 var entry = dbSet.Update(entity);
+                entry.State = EntityState.Detached;
             }
 
             var affected = await dbContext.SaveChangesAsync(token);
+            
+            if(affected > 0) 
+                DropCache();
+            
             return affected;
         }
 
diff --git a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
index d06e0b4c..383c587f 100644
--- a/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
+++ b/AsbCloudInfrastructure/Services/SAUB/SetpointsService.cs
@@ -2,7 +2,6 @@
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using AsbCloudInfrastructure.Repository;
-using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Caching.Memory;
 using System;
 using System.Collections.Generic;
@@ -62,9 +61,8 @@ namespace AsbCloudInfrastructure.Services.SAUB
             var all = await setpointsRepository.GetAllAsync(token);
             var filtered = all.Where(s =>
                 s.IdWell == idWell &&
-                s.IdState == 1 &&
-                s.UploadDate.AddSeconds(s.ObsolescenceSec) > DateTime.UtcNow)
-                .ToList();
+                s.IdState == 1 && 
+                s.UploadDate.AddSeconds(s.ObsolescenceSec) > DateTime.UtcNow);
 
             if (!filtered.Any())
                 return Enumerable.Empty<SetpointsRequestDto>();