Proper(ish) VdSwap - fixes a bunch of things.
Caching is working a bit better, now.