rid and test cleanup
Merge branch 'asynch'
removed module rid from cachable