Changed behaviour slightly to get data always.  Removed caching check