remove previous cache implementation