Fix java:// protocol not being cached
@rev goliver@
@bug W-2119992@
Merging origin/amcculloch/master-pending/cacheFixJavaProtocol into master