CE-297 added caching