finishing cache/remove functionality