Progress towards proper smart ptr caching