[+FEAT] Better block caching