Imroved caching EVEN MORE!