Merge pull request #38 from kBite/MODULES-7207/add-caches-support
(Modules-7207) Add 'caches' support