Remove location from model
Add cache tab