New fixes, need comprehensive changes to cache