feature chunk cache and cellbase adapter code clean up