Fixed device cache's becoming out of sync