Merge "Fix ordering of cache files requirements from device"