Add done. Cache still not correctly implemented