Revert "Add-in some re-auth logic when using os_cache"

This patch didn't do what it was supposed to do, make os_cache work. Instead it just adds complexity, so just remove it.

This reverts commit 8eed73ce20ff0808d350fc9af66d6ba55ebda017.

Change-Id: I7c118cbf8d8e2218e198d603f1984a9de18266c4
Merge "Revert "Add-in some re-auth logic when using os_cache""