Refactor SubscriptionManager caching code am: 29b1874ffc

Change-Id: I8168420f37eb8324580c8ec648d091f0b5a5bb7f