Use pypicache instead of pypiserver.
Merge branch 'pypi'