Remove disk cache because I think it's inelegant, causes stale cache problems and security issues; will replace with embedded wrapping