Re-added cachedUntil -> db

It'll probably break stuff though...
Build 259