Improve device caching