Added caching in UIM