Add oauth headers to cache key and update test grants.