merge changes, change cacheParcelData option to cache
1.0.0