Feature/fires cache policy