- fixed up the cache, but needs a serious review ... still, its fine for now