Adding tests and full touch behaviour for caching