Add edit/delete back to cache...need new solution