Bug fix for cache adaption