Base caching support. WIP
Changed base integration test to trait