Revert "remove location of item from loc_mapper and cache"

This reverts commit d2b8b4f0dd43cfec379b2e12cc9f723ee0fab7d6.