fixes related to CARBON-14884, had to keep caching feature as it related packages are being usede in cache mediator