Caching works... and encoding is a bit better now