Feature/smartcache