[to merge] Proxy working - probably

Bug fixes and am now clearing the container cache as this gets
borked by sharding.

Change-Id: Iad08f6e9bbeac687b6725c7f0ff244ee5751e6c4