Case 3362 - Added user data cache.
Case 3362 - Added dependency.
Merge branch 'case-3362' into develop

* case-3362:
  Case 3362 - Added dependency.
  Case 3362 - Added user data cache.