Caching fixed for networking
Merge branch 'dev'