Revert "Revert "update ResourceStore to act similar to database service, more to come""

This reverts commit de39d3640f8e1bcd166fd1232e6dfa1636aa932b.