diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesState.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesState.java
new file mode 100644
index 0000000..09870c6
--- /dev/null
+++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/dto/GooglePlacesState.java
@@ -0,0 +1,48 @@
+package pl.tpolgrabia.urbanexplorer.dto;
+
+import pl.tpolgrabia.googleutils.dto.GooglePlaceResult;
+
+import java.util.List;
+
+/**
+ * Created by tpolgrabia on 04.10.16.
+ */
+public class GooglePlacesState {
+
+    private List<GooglePlaceResult> places;
+    private String nextPageToken;
+    private boolean noMoreResults;
+
+    public void setPlaces(List<GooglePlaceResult> places) {
+        this.places = places;
+    }
+
+    public List<GooglePlaceResult> getPlaces() {
+        return places;
+    }
+
+    public void setNextPageToken(String nextPageToken) {
+        this.nextPageToken = nextPageToken;
+    }
+
+    public String getNextPageToken() {
+        return nextPageToken;
+    }
+
+    public void setNoMoreResults(boolean noMoreResults) {
+        this.noMoreResults = noMoreResults;
+    }
+
+    public boolean isNoMoreResults() {
+        return noMoreResults;
+    }
+
+    @Override
+    public String toString() {
+        return "GooglePlacesState{" +
+            "places=" + places +
+            ", nextPageToken='" + nextPageToken + '\'' +
+            ", noMoreResults=" + noMoreResults +
+            '}';
+    }
+}
diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
index 7f06e6d..acc43cc 100644
--- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
+++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/fragments/PlacesFragment.java
@@ -10,6 +10,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ListView;
 import android.widget.TextView;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import org.greenrobot.eventbus.EventBus;
 import org.greenrobot.eventbus.Subscribe;
 import org.slf4j.Logger;
@@ -26,11 +28,13 @@ import pl.tpolgrabia.urbanexplorer.R;
 import pl.tpolgrabia.urbanexplorer.adapters.PlacesAdapter;
 import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesRequest;
 import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesResponse;
+import pl.tpolgrabia.urbanexplorer.dto.GooglePlacesState;
 import pl.tpolgrabia.urbanexplorer.handlers.GooglePlacesScrollListener;
 import pl.tpolgrabia.urbanexplorer.worker.GooglePlacesWorker;
 import pl.tpolgrabia.urbanexplorerutils.callbacks.StandardLocationListenerCallback;
 import pl.tpolgrabia.urbanexplorerutils.utils.LocationUtils;
 
+import java.io.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Semaphore;
@@ -125,6 +129,24 @@ public class PlacesFragment extends Fragment {
 
         geocoderUtils = new GeocoderUtils(getActivity(), AppConstants.GOOGLE_API_KEY);
 
+        try (BufferedReader br = new BufferedReader(
+            new InputStreamReader(
+                new FileInputStream(
+                    new File(getActivity().getCacheDir(),
+                        GooglePlacesConstants.GOOGLE_PLACES_CACHE_FILE))))) {
+
+            Gson g = new GsonBuilder().create();
+            GooglePlacesState state = g.fromJson(br, GooglePlacesState.class);
+            places = state.getPlaces();
+            nextPageToken = state.getNextPageToken();
+            noMoreResults = state.isNoMoreResults();
+
+        } catch (FileNotFoundException e) {
+            // no cache, ok, it can happen
+        } catch (IOException e) {
+            lg.error("I/O error during reading cache file", e);
+        }
+
     }
 
     @Override
@@ -154,7 +176,10 @@ public class PlacesFragment extends Fragment {
             }
         });
         lg.debug("Fetching nearby places {}", location);
-        fetchNearbyPlacesAndPresent(location);
+
+        if (places == null || places.isEmpty()) {
+            fetchNearbyPlacesAndPresent(location);
+        }
 
     }
 
@@ -227,5 +252,26 @@ public class PlacesFragment extends Fragment {
         super.onDestroy();
 
         EventBus.getDefault().unregister(this);
+        GooglePlacesState state = new GooglePlacesState();
+        state.setPlaces(places);
+        state.setNextPageToken(nextPageToken);
+        state.setNoMoreResults(noMoreResults);
+
+        Gson g = new GsonBuilder().create();
+        try (BufferedWriter bw  = new BufferedWriter(
+            new OutputStreamWriter(
+                new FileOutputStream(
+                    new File(getActivity().getCacheDir(),
+                        GooglePlacesConstants.GOOGLE_PLACES_CACHE_FILE))))) {
+
+            g.toJson(state, bw);
+            bw.close();
+
+        } catch (FileNotFoundException e) {
+            lg.error("File not found error during saving a state", e);
+        } catch (IOException e) {
+            lg.error("I/O error during saving a state");
+        }
+
     }
 }
diff --git a/app/src/main/java/pl/tpolgrabia/urbanexplorer/handlers/GooglePlacesScrollListener.java b/app/src/main/java/pl/tpolgrabia/urbanexplorer/handlers/GooglePlacesScrollListener.java
index 0013eda..ea52825 100644
--- a/app/src/main/java/pl/tpolgrabia/urbanexplorer/handlers/GooglePlacesScrollListener.java
+++ b/app/src/main/java/pl/tpolgrabia/urbanexplorer/handlers/GooglePlacesScrollListener.java
@@ -21,7 +21,8 @@ public class GooglePlacesScrollListener implements AbsListView.OnScrollListener
 
     @Override
     public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
-        if (firstVisibleItem + visibleItemCount >= totalItemCount) {
+        // avoiding scroll bottom events on empty listview
+        if (totalItemCount > 0 && firstVisibleItem + visibleItemCount >= totalItemCount) {
             // scrolled to the bottom, loading new page
             placesFragment.loadNextPage();
         }
diff --git a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java
index 8b9ea55..ce0ad33 100644
--- a/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java
+++ b/googleutils/src/main/java/pl/tpolgrabia/googleutils/constants/GooglePlacesConstants.java
@@ -8,4 +8,5 @@ public class GooglePlacesConstants {
     public static final Long PHOTO_MAX_WIDTH = 512L;
     public static final String GOOGLE_MAPS_PLACES_API_BASEURL = "https://maps.googleapis.com/maps/api/place/";
     public static final String PLACES_SEARCH_TYPE = "museum";
+    public static final String GOOGLE_PLACES_CACHE_FILE = "places_state.dat";
 }