Roll back Enhanced Resource Registry Client changes that break tests

Code was added that prevents the cache from being updated.  This caused several instances of the cache becoming stale in INT test code.  This commit removes the errant code.