Fix broken unit tests after introducing CacheModule