Added support for locality group caching, entry deletion, and alternativ...

...e indexing by data/adapter ID