DAR-309

Added caching