* Add NSID to the cached responses
Signed-off-by: Erfan Besharat <erbesharat@gmail.com>

* Add test for NSID being set on cached responses
Signed-off-by: Erfan Besharat <erbesharat@gmail.com>