Current work checkpoint. See diff for details.
Fixed up Pii cache path selection routine
Merged develop
Merge branch 'feature/cache-work' into develop