Cache added. Finally. \o/
Fixing cache updating.
Code fix. I'm tired. Forgive me, oh <insert diety here>