Feature/restore caching