Actually remove entry from cache on call to remove. Update return type.