Fixed item-document caching issue.
Merge branch 'cache' into import-export