Add russian doll caching