diff --git a/pkg/cache/cache.go b/cache/cache.go
similarity index 100%
rename from pkg/cache/cache.go
rename to cache/cache.go
diff --git a/pkg/cache/memory_cache.go b/cache/memory_cache.go
similarity index 100%
rename from pkg/cache/memory_cache.go
rename to cache/memory_cache.go
diff --git a/pkg/cache/memory_cache_test.go b/cache/memory_cache_test.go
similarity index 100%
rename from pkg/cache/memory_cache_test.go
rename to cache/memory_cache_test.go
diff --git a/pkg/cache/telemetry_middleware.go b/cache/telemetry_middleware.go
similarity index 100%
rename from pkg/cache/telemetry_middleware.go
rename to cache/telemetry_middleware.go
diff --git a/pkg/account/client.go b/pkg/account/client.go
index 5349ed2917ed691f6661930ea0ffce72a79ab814..b6e535264d65097dd8a1a779ee8ad6a4a6ac6a19 100644
--- a/pkg/account/client.go
+++ b/pkg/account/client.go
@@ -3,7 +3,7 @@ package account
 import (
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	serviceMembers "git.perx.ru/perxis/perxis-go/pkg/members/middleware"
 	membersObserverTransport "git.perx.ru/perxis/perxis-go/pkg/members/observer/transport/grpc"
 	membersTransport "git.perx.ru/perxis/perxis-go/pkg/members/transport/grpc"
diff --git a/pkg/clients/middleware/caching_middleware.go b/pkg/clients/middleware/caching_middleware.go
index 0dd4f15b4e24affb13562c57a1d69b0e3adce33d..5fd0e832c261d751b0ff69a523368c0ba9898cb0 100644
--- a/pkg/clients/middleware/caching_middleware.go
+++ b/pkg/clients/middleware/caching_middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	service "git.perx.ru/perxis/perxis-go/pkg/clients"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 )
diff --git a/pkg/clients/middleware/caching_middleware_test.go b/pkg/clients/middleware/caching_middleware_test.go
index 821d2cb29579029f10e1726291212b6ccaeaceae..8fb4d1705c9120e97daa4a1af5aafbea1470be38 100644
--- a/pkg/clients/middleware/caching_middleware_test.go
+++ b/pkg/clients/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/clients"
 	csmocks "git.perx.ru/perxis/perxis-go/pkg/clients/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/collaborators/middleware/caching_middleware.go b/pkg/collaborators/middleware/caching_middleware.go
index 7faeb638b0ca2bb673de4852c21e75b7f1f9afc7..ff118c23f56d8adc471c491f2a3d300e4db6f5ce 100644
--- a/pkg/collaborators/middleware/caching_middleware.go
+++ b/pkg/collaborators/middleware/caching_middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	service "git.perx.ru/perxis/perxis-go/pkg/collaborators"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 )
diff --git a/pkg/collaborators/middleware/caching_middleware_test.go b/pkg/collaborators/middleware/caching_middleware_test.go
index 6b96d0a8ff65dcc56d3139e2b99eac28720bb364..d2d1b9bd946d9b937c2532c2e7319550630513e0 100644
--- a/pkg/collaborators/middleware/caching_middleware_test.go
+++ b/pkg/collaborators/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/collaborators"
 	csmocks "git.perx.ru/perxis/perxis-go/pkg/collaborators/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index cb95d0d9a8772f91700f5f630fa9bb2631e51937..8ad5604a45091fea4aaf17593e517bd192ba2ae4 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	service "git.perx.ru/perxis/perxis-go/pkg/collections"
 	envService "git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/schema"
diff --git a/pkg/collections/middleware/caching_middleware_test.go b/pkg/collections/middleware/caching_middleware_test.go
index 24646008ba32736ca45f7bcdc7e0a4845c43877d..73c7f182c81c24c8f81f60c7430d5bbc1b08444a 100644
--- a/pkg/collections/middleware/caching_middleware_test.go
+++ b/pkg/collections/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/collections"
 	colsmocks "git.perx.ru/perxis/perxis-go/pkg/collections/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
diff --git a/pkg/content/client.go b/pkg/content/client.go
index adc5f784dff8fccd5b505867bf65efb373a9149d..c68ec20e76643cd51dc54f6606696a3f80e3e598 100644
--- a/pkg/content/client.go
+++ b/pkg/content/client.go
@@ -3,7 +3,7 @@ package content
 import (
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	clientsSvc "git.perx.ru/perxis/perxis-go/pkg/clients/middleware"
 	clientsTransportGrpc "git.perx.ru/perxis/perxis-go/pkg/clients/transport/grpc"
 	collaboratorsSvc "git.perx.ru/perxis/perxis-go/pkg/collaborators/middleware"
diff --git a/pkg/delivery/client/client.go b/pkg/delivery/client/client.go
index e3fb962c22cd76d4adc2cbd5ca9d6195eb9e41d6..3f606ae71ea8281122dd2e3383e7b977fdffb703 100644
--- a/pkg/delivery/client/client.go
+++ b/pkg/delivery/client/client.go
@@ -3,7 +3,7 @@ package client
 import (
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	collections "git.perx.ru/perxis/perxis-go/pkg/collections/middleware"
 	"git.perx.ru/perxis/perxis-go/pkg/delivery"
 	deliveryservice "git.perx.ru/perxis/perxis-go/pkg/delivery/service"
diff --git a/pkg/environments/middleware/caching_middleware.go b/pkg/environments/middleware/caching_middleware.go
index c53f45e8bdcdb61f59f1af0acf11bc0f412c2629..b2c1f713fb49d0642d37e966a74a4f52ad2a4214 100644
--- a/pkg/environments/middleware/caching_middleware.go
+++ b/pkg/environments/middleware/caching_middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	service "git.perx.ru/perxis/perxis-go/pkg/environments"
 )
diff --git a/pkg/environments/middleware/caching_middleware_test.go b/pkg/environments/middleware/caching_middleware_test.go
index cbac396352657115e96d98b6715aa7e371a353a8..f8af11fb76c3eeeff1297812ad0c8bb93a26d3bd 100644
--- a/pkg/environments/middleware/caching_middleware_test.go
+++ b/pkg/environments/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	mocksenvironments "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/invitations/middleware/caching_middleware.go b/pkg/invitations/middleware/caching_middleware.go
index b14a155dc04022baed930f4252ec63caf47dab3b..2c853b37ebf474befc5b809d946d1fd36b401b46 100644
--- a/pkg/invitations/middleware/caching_middleware.go
+++ b/pkg/invitations/middleware/caching_middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	service "git.perx.ru/perxis/perxis-go/pkg/invitations"
 	services "git.perx.ru/perxis/perxis-go/pkg/options"
 )
diff --git a/pkg/invitations/middleware/caching_middleware_test.go b/pkg/invitations/middleware/caching_middleware_test.go
index 46d0a44342822a877be1feffbc396e37606e8157..68d4c8dce0b9338d0391e60db161c2f25be15056 100644
--- a/pkg/invitations/middleware/caching_middleware_test.go
+++ b/pkg/invitations/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/invitations"
 	invmocks "git.perx.ru/perxis/perxis-go/pkg/invitations/mocks"
diff --git a/pkg/items/middleware/caching_middleware.go b/pkg/items/middleware/caching_middleware.go
index 60d3bf80250843f2ddc963fe5d242e58f590a3f7..4bce95b607856b142f56de078308c59229d0675d 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/pkg/items/middleware/caching_middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	envService "git.perx.ru/perxis/perxis-go/pkg/environments"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	service "git.perx.ru/perxis/perxis-go/pkg/items"
diff --git a/pkg/items/middleware/caching_middleware_test.go b/pkg/items/middleware/caching_middleware_test.go
index 4d777647788f290acf4e55550c435fa7ba27153a..0105285b39c476b5036fb98720c30f572afbf16e 100644
--- a/pkg/items/middleware/caching_middleware_test.go
+++ b/pkg/items/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/environments"
 	envmocks "git.perx.ru/perxis/perxis-go/pkg/environments/mocks"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
diff --git a/pkg/locales/middleware/caching_middleware.go b/pkg/locales/middleware/caching_middleware.go
index 64f82bc2347323140674cb7375bfe41a36a5bfb0..07444b7ac595d888447cd6c86d905c90870d179e 100644
--- a/pkg/locales/middleware/caching_middleware.go
+++ b/pkg/locales/middleware/caching_middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	service "git.perx.ru/perxis/perxis-go/pkg/locales"
 )
diff --git a/pkg/locales/middleware/caching_middleware_test.go b/pkg/locales/middleware/caching_middleware_test.go
index 25b542c840c228324f843267ae3968f96d0ddfe5..c8d5637ade0d60a78e2080cac86ac6c76034ae6b 100644
--- a/pkg/locales/middleware/caching_middleware_test.go
+++ b/pkg/locales/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/locales"
 	locmocks "git.perx.ru/perxis/perxis-go/pkg/locales/mocks"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/members/middleware/caching_middleware.go b/pkg/members/middleware/caching_middleware.go
index 4c61bff9078028009130bc7378908a6db551bba2..21ed30a706c7b1279c4983704ad62fc61303e718 100644
--- a/pkg/members/middleware/caching_middleware.go
+++ b/pkg/members/middleware/caching_middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	service "git.perx.ru/perxis/perxis-go/pkg/members"
 )
diff --git a/pkg/members/middleware/caching_middleware_test.go b/pkg/members/middleware/caching_middleware_test.go
index ea09d522188857ee841336e4d8dbdf9cad7ff55c..d8c67efda250cc89950af60df8b4c36a0fb3414d 100644
--- a/pkg/members/middleware/caching_middleware_test.go
+++ b/pkg/members/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/members"
 	mocksmembers "git.perx.ru/perxis/perxis-go/pkg/members/mocks"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/organizations/middleware/caching_middleware.go b/pkg/organizations/middleware/caching_middleware.go
index c6503200cfbc47915475a95c154a253dec51e29c..645faca3c3357845688d139a3c9526cd8f8f45ca 100644
--- a/pkg/organizations/middleware/caching_middleware.go
+++ b/pkg/organizations/middleware/caching_middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/options"
 	service "git.perx.ru/perxis/perxis-go/pkg/organizations"
 )
diff --git a/pkg/organizations/middleware/caching_middleware_test.go b/pkg/organizations/middleware/caching_middleware_test.go
index f9999cfce509debda6b49d5aa5ee26a3d60d0f4f..9ff24d8a03d3716c2ce17d16afeb6697bca41a30 100644
--- a/pkg/organizations/middleware/caching_middleware_test.go
+++ b/pkg/organizations/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/organizations"
 	mocksorgs "git.perx.ru/perxis/perxis-go/pkg/organizations/mocks"
diff --git a/pkg/roles/middleware/caching_middleware.go b/pkg/roles/middleware/caching_middleware.go
index 2bcb04d3df7278d619fe80b2a6b02c48ea58f1fb..6e64e85f74764a47022b8fbc12cc046b9dbfb0b7 100644
--- a/pkg/roles/middleware/caching_middleware.go
+++ b/pkg/roles/middleware/caching_middleware.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	service "git.perx.ru/perxis/perxis-go/pkg/roles"
 )
diff --git a/pkg/roles/middleware/caching_middleware_test.go b/pkg/roles/middleware/caching_middleware_test.go
index b9ac8ec826439319348bac2b13fc743c3753d024..23ddfe6252e43e49f7a75b81aff917555a61eefd 100644
--- a/pkg/roles/middleware/caching_middleware_test.go
+++ b/pkg/roles/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/roles"
 	rsmocks "git.perx.ru/perxis/perxis-go/pkg/roles/mocks"
diff --git a/pkg/spaces/middleware/caching_middleware.go b/pkg/spaces/middleware/caching_middleware.go
index c7f35de12106e9aa828e56ebd6f6ec4361c70da7..7f7c73f2a72eb885a2c7cae36d9955197360a2c4 100644
--- a/pkg/spaces/middleware/caching_middleware.go
+++ b/pkg/spaces/middleware/caching_middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/data"
 	"git.perx.ru/perxis/perxis-go/pkg/options"
 	service "git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/spaces/middleware/caching_middleware_test.go b/pkg/spaces/middleware/caching_middleware_test.go
index 0674c932eb4e5f9d519a587a45cc4c5003b8f7d7..d9278dd14ca548986e2f160b7547f38bc79c6fee 100644
--- a/pkg/spaces/middleware/caching_middleware_test.go
+++ b/pkg/spaces/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 
 	"git.perx.ru/perxis/perxis-go/pkg/spaces"
diff --git a/pkg/users/middleware/caching_middleware.go b/pkg/users/middleware/caching_middleware.go
index 825da6a28caabeee0f71d9030b60c8152e884570..3841867a45386852dfaf29c25a1767db2a800565 100644
--- a/pkg/users/middleware/caching_middleware.go
+++ b/pkg/users/middleware/caching_middleware.go
@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	services "git.perx.ru/perxis/perxis-go/pkg/options"
 	service "git.perx.ru/perxis/perxis-go/pkg/users"
 )
diff --git a/pkg/users/middleware/caching_middleware_test.go b/pkg/users/middleware/caching_middleware_test.go
index c5755407c6ffbc163f86ed548ad4b50c5d8bfc94..d3dd65bc1a87c281f4830054795d708eff50ba42 100644
--- a/pkg/users/middleware/caching_middleware_test.go
+++ b/pkg/users/middleware/caching_middleware_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"git.perx.ru/perxis/perxis-go/pkg/cache"
+	"git.perx.ru/perxis/perxis-go/cache"
 	"git.perx.ru/perxis/perxis-go/pkg/errors"
 	"git.perx.ru/perxis/perxis-go/pkg/users"
 	"git.perx.ru/perxis/perxis-go/pkg/users/mocks"