more changes to integrate the new cache approach