Improve client to deal with reloading resources more intelligently.