Refactor SubscriptionManager caching code am: 29b1874ffc

Change-Id: I9b3eeade5d5b7ddc91ede9c340ab1381cb4e9278