Cleaned code
Fixed nocache to apply after device-specific config on Core