Working on caching. See #434