#172 Repo.Cached removed
#172 polished