removed cache properties and added it to store