[FIX] Expiry feature of Siteinfo

The expiry needs to be converted into a timestamp also if the int
is 0 (it thought it can the cache thing completely). Also one call
used the old "force" parameter which was discontinued.

Change-Id: Ifc3406eab34e5cc5734c0659c9113cd277a23014