Revert "Revert "changes from xaseco and added maplistmodified cache empty""

This reverts commit 3769bacb899db1f1baeaef7ff0181c4f5aa9b0da.