ESDEV-2413 Removed unnecessary caching