Add cache (expirable), fix model creation, ...