Fixed local cache and added append