-- Added the last few commits from App_cache_testing  branch without merging the branches it though git