Fix socket caching-ish bug