Merge change 9602

* changes:
  Add incoming connections to the cache and change authorization check.