Lussutus.
Fixes.
Caching betterments.
Revert ""

This reverts commit 5299892c53e26e53f75250748a27a01368da7689.