Fix #19: Provide CacheAwareTrait