Cache system.
Fixing remaining issues.