Make it more boostcache-compitable