Feature/custom caching