misc fixes
refactor cancelables
add custom converter
add computed custom converter
Merge branch 'dev' into cache
update cache