[development] cache flexibility improvement