Add caching of UCS data
5 files changed