Refactor SubscriptionManager caching code am: 29b1874ffc am: 2ec58b1158

Change-Id: Icbf02f035f765129189645553f45bc98c1841d70