Performance improvement for FileBasedRepository (#43)