Fixing something or other.
Fixing some cache related NPE's.