Fixes issue #1 re: cahcing.