LINT fixes
Fixed caching of devices