diff --git a/AsbCloudInfrastructure/Services/Cache/CacheDb.cs b/AsbCloudInfrastructure/Services/Cache/CacheDb.cs
index e4c8cf8f..a43be14b 100644
--- a/AsbCloudInfrastructure/Services/Cache/CacheDb.cs
+++ b/AsbCloudInfrastructure/Services/Cache/CacheDb.cs
@@ -1,31 +1,47 @@
 using Microsoft.EntityFrameworkCore;
-using System;
+using System.Linq;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
+using System;
+using AsbCloudApp;
 
 namespace AsbCloudInfrastructure.Services.Cache
 {
-
     public class CacheDb
     {
         private readonly ConcurrentDictionary<string, CacheTableDataStore> cache = 
             new ConcurrentDictionary<string, CacheTableDataStore>();
 
-
         public CacheTable<TEntity> GetCachedTable<TEntity>(DbContext context, params string[] includes)
             where TEntity : class
-            => GetCachedTable<TEntity>(context, includes);
+            => GetCachedTable<TEntity>(context, new SortedSet<string>(includes));
 
-        public CacheTable<TEntity> GetCachedTable<TEntity>(DbContext context, IEnumerable<string> includes = null)
+        public CacheTable<TEntity> GetCachedTable<TEntity>(DbContext context, ISet<string> includes = null)
+            where TEntity : class
+        {
+            var cacheItem = GetCacheTableDataStore<TEntity>();
+            var tableCache = new CacheTable<TEntity>(context, cacheItem, includes);
+            return tableCache;
+        }
+
+        public CacheTable<TEntity> GetCachedTable<TEntity>(DbContext context, Func<DbSet<TEntity>, IQueryable<TEntity>> configureDbSet)
+            where TEntity : class
+        {
+            var cacheItem = GetCacheTableDataStore<TEntity>();
+            var tableCache = new CacheTable<TEntity>(context, cacheItem, configureDbSet);
+            return tableCache;
+        }
+
+        private CacheTableDataStore GetCacheTableDataStore<TEntity>()
             where TEntity : class
         {
             var nameOfTEntity = typeof(TEntity).FullName;
-            var cacheItem = cache.GetOrAdd(nameOfTEntity, (nameOfTEntity) => new CacheTableDataStore {
+            var cacheItem = cache.GetOrAdd(nameOfTEntity, (nameOfTEntity) => new CacheTableDataStore
+            {
                 NameOfTEntity = nameOfTEntity,
                 Entities = new List<TEntity>(),
             });
-            var tableCache = new CacheTable<TEntity>(context, cacheItem, includes);
-            return tableCache;
+            return cacheItem;
         }
 
         public void DropAll() => cache.Clear();
diff --git a/AsbCloudInfrastructure/Services/Cache/CacheTable.cs b/AsbCloudInfrastructure/Services/Cache/CacheTable.cs
index 2ff98b5e..b1932283 100644
--- a/AsbCloudInfrastructure/Services/Cache/CacheTable.cs
+++ b/AsbCloudInfrastructure/Services/Cache/CacheTable.cs
@@ -23,22 +23,21 @@ namespace AsbCloudInfrastructure.Services.Cache
         private readonly DbContext context;
         private readonly DbSet<TEntity> dbSet;
 
-        internal CacheTable(DbContext context, CacheTableDataStore data, IEnumerable<string> includes = null)
+        internal CacheTable(DbContext context, CacheTableDataStore data, ISet<string> includes = null)
         {
             this.context = context;
             this.data = data;
             dbSet = context.Set<TEntity>();
-
+            
             if (includes?.Any() == true)
                 configureDbSet = (DbSet<TEntity> dbSet) =>
                 {
                     IQueryable<TEntity> result = dbSet;
-                    foreach (var include in includes)
-                        result = result.Include(include);
+                    foreach (var include in includes)                    
+                        result = result.Include(include);                                            
                     return result;
                 };
 
-
             cached = (List<TEntity>)data.Entities;
             if ((cached.Count == 0) || data.IsObsolete)
                 Refresh(false);
diff --git a/AsbCloudInfrastructure/Services/Cache/CacheTableDataStore.cs b/AsbCloudInfrastructure/Services/Cache/CacheTableDataStore.cs
index be9dfcf8..ef900b11 100644
--- a/AsbCloudInfrastructure/Services/Cache/CacheTableDataStore.cs
+++ b/AsbCloudInfrastructure/Services/Cache/CacheTableDataStore.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace AsbCloudInfrastructure.Services.Cache
 {
@@ -7,6 +8,8 @@ namespace AsbCloudInfrastructure.Services.Cache
     {
         public string NameOfTEntity { get; set; }
         public DateTime LastResreshDate { get; set; }
+
+        //public ISet<string> Includes { get; set; } //TODO: this prop change should update entities
         public IEnumerable Entities { get; set; }
         public TimeSpan ObsolesenceTime  { get; set; } = TimeSpan.FromMinutes(15);
         public bool IsObsolete => (DateTime.Now - LastResreshDate > ObsolesenceTime);