Updated to be compatible with new Tiberius cache system.